feat(os): update to android 11 (#3)

Fixes #2

Author: Shmayro

Dockerfile

@@ -43,7 +43,7 @@ RUN mkdir /root/.android/ && \
 
 
 # Detect architecture and set environment variable
-RUN yes | sdkmanager --sdk_root=$ANDROID_HOME "emulator" "platform-tools" "platforms;android-29" "system-images;android-29;default;x86_64"
+RUN yes | sdkmanager --sdk_root=$ANDROID_HOME "emulator" "platform-tools" "platforms;android-30" "system-images;android-30;default;x86_64"
 # RUN if [ "$(uname -m)" = "aarch64" ]; then \
 #         unzip /root/emulator.zip -d $ANDROID_HOME && \
 # 	mv /root/package.xml $ANDROID_HOME/emulator/package.xml && \
@@ -65,6 +65,10 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY first-boot.sh /root/first-boot.sh
 RUN chmod +x /root/first-boot.sh
 
+# Copy the start-emulator script
+COPY start-emulator.sh /root/start-emulator.sh
+RUN chmod +x /root/start-emulator.sh
+
 # Expose necessary ports
 EXPOSE 5554 5555
 

docker-compose.yml

@@ -8,10 +8,8 @@ services:
     volumes:
       - ./data:/data
       - ./extras:/extras
-      - ./patch/ramdisk.img:/opt/android-sdk/system-images/android-29/default/x86_64/ramdisk.img
-      - ./patch/ramdisk.img.backup:/opt/android-sdk/system-images/android-29/default/x86_64/ramdisk.img.backup
     environment:
-      - DNS=1.1.1.1
+      - DNS=one.one.one.one
       - RAM_SIZE=8192
     privileged: true
     devices:

first-boot.sh

@@ -9,14 +9,19 @@ apply_settings() {
     COMPLETED=$(adb shell getprop sys.boot_completed | tr -d '\r')
     sleep 5
   done
+  adb root
   adb shell settings put global window_animation_scale 0
   adb shell settings put global transition_animation_scale 0
   adb shell settings put global animator_duration_scale 0
   adb shell settings put global stay_on_while_plugged_in 0
   adb shell settings put system screen_off_timeout 15000
+  adb shell settings put system accelerometer_rotation 0
   adb shell settings put global private_dns_mode hostname
-  adb shell settings put global private_dns_specifier dns2024.haroun.dev
-  # adb shell svc wifi disable
+  adb shell settings put global private_dns_specifier ${DNS:-one.one.one.one}
+  adb shell settings put global airplane_mode_on 1
+  adb shell am broadcast -a android.intent.action.AIRPLANE_MODE --ez state true
+  adb shell svc data disable
+  adb shell svc wifi enable
 }
 
 # Detect ip and forward ADB ports from the container's network
@@ -34,7 +39,7 @@ fi
 
 echo "Init ADV ..."
 
-echo "no" | avdmanager create avd -n test -k "system-images;android-29;default;x86_64"
+echo "no" | avdmanager create avd -n android -k "system-images;android-30;default;x86_64"
 
 echo "Preparation ..."
 
@@ -52,32 +57,33 @@ done
 
 echo "Installing GAPPS ..."
 
-wget https://deac-fra.dl.sourceforge.net/project/opengapps/x86_64/20220503/open_gapps-x86_64-10.0-pico-20220503.zip?viasf=1 -O gapps-10.zip
-unzip gapps-10.zip 'Core/*' -d gapps-10  && rm gapps-10.zip
-rm gapps-10/Core/setup*
-lzip -d gapps-10/Core/*.lz
-for f in $(ls gapps-10/Core/*.tar); do
-  tar -x --strip-components 2 -f $f -C gapps-10
+wget https://netcologne.dl.sourceforge.net/project/opengapps/x86_64/20220503/open_gapps-x86_64-11.0-pico-20220503.zip?viasf=1 -O gapps-11.zip
+unzip gapps-11.zip 'Core/*' -d gapps-11  && rm gapps-11.zip
+rm gapps-11/Core/setup*
+lzip -d gapps-11/Core/*.lz
+for f in $(ls gapps-11/Core/*.tar); do
+  tar -x --strip-components 2 -f $f -C gapps-11
 done
 
-adb push gapps-10/etc /system
-adb push gapps-10/framework /system
-adb push gapps-10/app /system
-adb push gapps-10/priv-app /system
+adb push gapps-11/etc /system
+adb push gapps-11/framework /system
+adb push gapps-11/app /system
+adb push gapps-11/priv-app /system
 
 echo "Root Script Starting..."
 
 # Root the VM
 git clone https://gitlab.com/newbit/rootAVD.git
 pushd rootAVD
 sed -i 's/read -t 10 choice/choice=2/' rootAVD.sh
-./rootAVD.sh system-images/android-29/default/x86_64/ramdisk.img
+./rootAVD.sh system-images/android-30/default/x86_64/ramdisk.img
+cp /opt/android-sdk/system-images/android-30/default/x86_64/ramdisk.img /data/android.avd/ramdisk.img
 popd
 echo "Root Done"
 sleep 15
 echo "Cleanup ..."
 # done
-rm -r gapps-10
+rm -r gapps-11
 rm -r rootAVD
 apply_settings
 touch /data/.first-boot-done

patch/ramdisk.img

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Check if the .first-boot-done file exists
+if [ -f /data/.first-boot-done ]; then
+  RAMDISK_PATH="-ramdisk /data/android.avd/ramdisk.img"
+fi
+
+# Start the emulator with the appropriate ramdisk.img
+/opt/android-sdk/emulator/emulator -avd android -writable-system -no-window -no-audio -no-boot-anim -skip-adb-auth -gpu swiftshader_indirect -no-snapshot $RAMDISK_PATH -qemu -m ${RAM_SIZE:-4096}

patch/ramdisk.img.backup

@@ -6,7 +6,7 @@ user=root
 serverurl=unix:///var/run/supervisor.sock
 
 [program:emulator]
-command=/bin/bash -c "/opt/android-sdk/emulator/emulator -avd test -writable-system -no-window -no-audio -no-boot-anim -skip-adb-auth -gpu swiftshader_indirect -no-snapshot -qemu -m ${RAM_SIZE:-4096}"
+command=/bin/bash /root/start-emulator.sh
 stdout_logfile=/var/log/supervisor/emulator.out.log
 stderr_logfile=/var/log/supervisor/emulator.err.log
 autorestart=true