scott/docker-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
Budi Utomo 2019-07-25 12:51:27 +02:00 committed by GitHub
parent d1126b58c2 5923820261
commit b707d1971f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/utils.sh
View file

@ -17,7 +17,7 @@ function wait_emulator_to_be_ready () {
function change_language_if_needed() { function change_language_if_needed() {
if [ ! -z "${LANGUAGE// }" ] && [ ! -z "${COUNTRY// }" ]; then if [ ! -z "${LANGUAGE// }" ] && [ ! -z "${COUNTRY// }" ]; then
wait_emulator_to_be_ready wait_emulator_to_be_ready
echo "Languge will be changed to ${LANGUAGE}-${COUNTRY}" echo "Language will be changed to ${LANGUAGE}-${COUNTRY}"
adb root && adb shell "setprop persist.sys.language $LANGUAGE; setprop persist.sys.country $COUNTRY; stop; start" && adb unroot adb root && adb shell "setprop persist.sys.language $LANGUAGE; setprop persist.sys.country $COUNTRY; stop; start" && adb unroot
echo "Language is changed!" echo "Language is changed!"
fi fi
@ -55,15 +55,9 @@ function enable_proxy_if_needed () {
echo "Enable proxy on Android emulator. Please make sure that docker-container has internet access!" echo "Enable proxy on Android emulator. Please make sure that docker-container has internet access!"
adb root adb root
echo "Mount system to read write access" echo "Set up the Proxy"
adb shell "mount -o rw,remount /system"
echo "Updateing Proxy"
adb shell "content update --uri content://telephony/carriers --bind proxy:s:"${p[0]}" --bind port:s:"${p[1]}" --where "mcc=310" --where "mnc=260"" adb shell "content update --uri content://telephony/carriers --bind proxy:s:"${p[0]}" --bind port:s:"${p[1]}" --where "mcc=310" --where "mnc=260""
echo "remount system back to read only"
adb shell "mount -o ro,remount /system"
adb unroot adb unroot
else else
echo "Please use http:// in the beginning!" echo "Please use http:// in the beginning!"