Snap for 4821244 from 58ea3df6b8a524a335974ecea65b288338c94f42 to pi-release

Change-Id: I260a2f8436f5020182a2ae7a5cb6383f95795623

2 files changed, 3 insertions, 80 deletions

diff --git a/init.ranchu-core.sh b/init.ranchu-core.sh
index e255cdba..33583825 100755
--- a/init.ranchu-core.sh
+++ b/init.ranchu-core.sh
@@ -1,46 +1,4 @@
 #!/vendor/bin/sh
 
-
-# ro.kernel.android.qemud is normally set when we
-# want the RIL (radio interface layer) to talk to
-# the emulated modem through qemud.
-#
-# However, this will be undefined in two cases:
-#
-# - When we want the RIL to talk directly to a guest
-#   serial device that is connected to a host serial
-#   device by the emulator.
-#
-# - We don't want to use the RIL but the VM-based
-#   modem emulation that runs inside the guest system
-#   instead.
-#
-# The following detects the latter case and sets up the
-# system for it.
-#
-qemud=`getprop ro.kernel.android.qemud`
-case "$qemud" in
-    "")
-    radio_ril=`getprop ro.kernel.android.ril`
-    case "$radio_ril" in
-        "")
-        # no need for the radio interface daemon
-        # telephony is entirely emulated in Java
-        setprop ro.radio.noril yes
-        stop ril-daemon
-        ;;
-    esac
-    ;;
-esac
-
-
-# disable boot animation for a faster boot sequence when needed
-boot_anim=`getprop ro.kernel.android.bootanim`
-case "$boot_anim" in
-    0)  setprop debug.sf.nobootanimation 1
-    ;;
-esac
-
-
 # take the wake lock
 echo "emulator_wake_lock" > /sys/power/wake_lock
diff --git a/init.ranchu.rc b/init.ranchu.rc
index def5f6da..d069b342 100644
--- a/init.ranchu.rc
+++ b/init.ranchu.rc
@@ -14,15 +14,6 @@ on post-fs-data
     mkdir /data/vendor/var 0755 root root
     mkdir /data/vendor/var/run 0755 root root
     mkdir /data/vendor/var/run/netns 0755 root root
-    mkdir /data/misc/wifi 0770 wifi wifi
-    mkdir /data/misc/wifi/sockets 0770 wifi wifi
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
-    chown system system /data/misc/wifi/WifiConfigStore.xml
-    chown dhcp dhcp /data/misc/dhcp
-    setprop persist.traced.enable 1
-
-on boot && property:ro.debuggable=1
-    setprop ro.adb.secure 0
 
 on boot
     setprop debug.hwui.renderer opengl
@@ -32,35 +23,10 @@ on boot
     setprop dalvik.vm.heapsize ${ro.kernel.qemu.dalvik.vm.heapsize}
     chown root system /sys/power/wake_lock
     chown root system /sys/power/wake_unlock
-    setprop ro.radio.use-ppp no
     setprop ro.hardware.audio.primary goldfish
-    setprop ro.setupwizard.mode EMULATOR
-
-# fake some battery state
-    setprop status.battery.state Slow
-    setprop status.battery.level 5
-    setprop status.battery.level_raw  50
-    setprop status.battery.level_scale 9
-
-
-# set up the GPU caching
-    setprop ro.hwui.texture_cache_size 72
-    setprop ro.hwui.layer_cache_size 48
-    setprop ro.hwui.r_buffer_cache_size 8
-    setprop ro.hwui.path_cache_size 32
-    setprop ro.hwui.gradient_cache_size 1
-    setprop ro.hwui.drop_shadow_cache_size 6
-    setprop ro.hwui.texture_cache_flushrate 0.4
-    setprop ro.hwui.text_small_cache_width 1024
-    setprop ro.hwui.text_small_cache_height 1024
-    setprop ro.hwui.text_large_cache_width 2048
-    setprop ro.hwui.text_large_cache_height 1024
 
     setprop wifi.interface wlan0
 
-# enable Google-specific location features,
-# like NetworkLocationProvider and LocationCollector
-    setprop ro.com.google.locationfeatures 1
 
 service ranchu-setup /vendor/bin/init.ranchu-core.sh
     class core
@@ -71,6 +37,9 @@ service ranchu-setup /vendor/bin/init.ranchu-core.sh
 on property:qemu.timezone=*
     setprop persist.sys.timezone ${qemu.timezone}
 
+on property:ro.kernel.android.bootanim=0
+    setprop debug.sf.nobootanimation 1
+
 service ranchu-net /vendor/bin/init.ranchu-net.sh
     class late_start
     user root
@@ -129,10 +98,6 @@ service goldfish-logcat /system/bin/logcat -Q
     group log
     oneshot
 
-service fingerprintd /system/bin/fingerprintd
-    class late_start
-    user system
-
 service bugreport /system/bin/dumpstate -d -p -B -z \
         -o /data/user_de/0/com.android.shell/files/bugreports/bugreport
     class main