ravindu
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Downgraded android OS version to avoid ANR

Browse Source
revert-dabc3590
charitha 8 years ago
parent 2d67d33eb6
commit e13aa77b21
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/resources/config.ini
Unescape View File

@ -20,7 +20,7 @@ hw.sdCard=no
hw.sensors.orientation=yes hw.sensors.orientation=yes
hw.sensors.proximity=yes hw.sensors.proximity=yes
hw.trackBall=no hw.trackBall=no
image.sysdir.1=system-images/android-24/default/x86/ image.sysdir.1=system-images/android-23/default/x86/
skin.dynamic=no skin.dynamic=no
skin.name=720x1280 skin.name=720x1280
skin.path=720x1280 skin.path=720x1280

44
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/start
Unescape View File

@ -56,48 +56,48 @@ getAndroidSDK() {
} }
createAVD() { createAVD() {
if [ ! -d "$ANDROID_TRYIT_SDK_HOME/platforms/android-24" ]; then if [ ! -d "$ANDROID_TRYIT_SDK_HOME/platforms/android-23" ]; then
echo echo
echo "Downloading Android platform..." echo "Downloading Android platform..."
cd $ANDROID_TRYIT_SDK_HOME cd $ANDROID_TRYIT_SDK_HOME
downloadArtifacts "https://dl.google.com/android/repository/platform-24_r02.zip" downloadArtifacts "https://dl.google.com/android/repository/platform-23_r03.zip"
echo -n "Configuring Android platform..." echo -n "Configuring Android platform..."
unzip -q platform-24_r02.zip unzip -q platform-23_r03.zip
mkdir -p platforms/android-24 mkdir -p platforms/android-23
mv android-7.0/* platforms/android-24/ mv android-6.0/* platforms/android-23/
rm -r android-7.0 rm -r android-6.0
rm platform-24_r02.zip rm platform-23_r03.zip
cd .. cd ..
echo " Done!" echo " Done!"
fi fi
if [ ! -d "$ANDROID_TRYIT_SDK_HOME/system-images/android-24/default" ]; then if [ ! -d "$ANDROID_TRYIT_SDK_HOME/system-images/android-23/default" ]; then
echo "Downloading Android system image..." echo "Downloading Android system image..."
cd $ANDROID_TRYIT_SDK_HOME cd $ANDROID_TRYIT_SDK_HOME
downloadArtifacts "https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip" downloadArtifacts "https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip"
echo -n "Configuring Android system image..." echo -n "Configuring Android system image..."
unzip -q x86-24_r07.zip unzip -q x86-23_r09.zip
mkdir -p system-images/android-24/default mkdir -p system-images/android-23/default
mv x86 system-images/android-24/default mv x86 system-images/android-23/default
rm x86-24_r07.zip rm x86-23_r09.zip
cd .. cd ..
echo " Done!" echo " Done!"
fi fi
echo "Creating a new AVD device" echo "Creating a new AVD device"
if [ -f "$ANDROID_TRYIT_SDK_HOME/tools/bin/avdmanager" ]; then if [ -f "$ANDROID_TRYIT_SDK_HOME/tools/bin/avdmanager" ]; then
$ANDROID_TRYIT_SDK_HOME/tools/bin/avdmanager create avd -k 'system-images;android-24;default;x86' -n WSO2_AVD $ANDROID_TRYIT_SDK_HOME/tools/bin/avdmanager create avd -k 'system-images;android-23;default;x86' -n WSO2_AVD
else else
$ANDROID_TRYIT_SDK_HOME/tools/android create avd -n WSO2_AVD -t android-24 $ANDROID_TRYIT_SDK_HOME/tools/android create avd -n WSO2_AVD -t android-23
fi fi
rm $HOME/.android/avd/WSO2_AVD.avd/resources/config.ini rm $HOME/.android/avd/WSO2_AVD.avd/config.ini
cp $SCRIPT_HOME/resources/config.ini $HOME/.android/avd/WSO2_AVD.avd/ cp $SCRIPT_HOME/resources/config.ini $HOME/.android/avd/WSO2_AVD.avd/
startAVD startAVD
} }
startAVD() { startAVD() {
if [ ! -d "$HOME/.android/avd/WSO2_AVD.avd" ]; then if [ ! -d "$HOME/.android/avd/WSO2_AVD.avd" ]; then
echo -n "Seems you don't have WSO2_AVD. Do you want to create WSO2_AVD with default configs (y/N)?: " echo -n "Looks you don't have the WSO2_AVD. Do you want to create WSO2_AVD with default configs (Y/n)?: "
read answer read answer
if echo "$answer" | grep -iq "^y" ;then if ! echo "$answer" | grep -iq "^n" ;then
createAVD createAVD
return return
fi fi
@ -178,12 +178,12 @@ echo "| WSO2 Android Tryit |"
echo "+----------------------------------------------------------------+" echo "+----------------------------------------------------------------+"
echo "Detected OS: " $OSTYPE echo "Detected OS: " $OSTYPE
if [ ! -f "sdklocation" ]; then if [ ! -f "sdklocation" ]; then
echo -n "Do you have Android SDK installed in your computer (Y/n)?: " echo -n "Do you have an Android SDK installed on your computer (y/N)?: "
read answer read answer
if echo "$answer" | grep -iq "^n" ;then if echo "$answer" | grep -iq "^y" ;then
getAndroidSDK
else
setSDKPath setSDKPath
else
getAndroidSDK
fi fi
fi fi
export ANDROID_TRYIT_SDK_HOME=$(<sdklocation) export ANDROID_TRYIT_SDK_HOME=$(<sdklocation)

Write Preview
Loading…
Cancel
Save