Use Package Manager to disable stock OTA

This reverts commit ea14a88.

Using the Package Manager prevents any danling wakelock from
killed service/receiver.

Change-Id: Ie3162ca4b18a7bc9c55613af39e88ea980407e5f

Conflicts:
	config/common.mk

config/common.mk

@@ -125,10 +125,6 @@ PRODUCT_COPY_FILES += \
     vendor/carbon/prebuilt/common/bin/99-backup.sh:system/addon.d/99-backup.sh \
     vendor/carbon/prebuilt/common/etc/backup.conf:system/etc/backup.conf
 
-# block stock OTAs
-PRODUCT_COPY_FILES += \
-    vendor/carbon/prebuilt/common/bin/otablock:system/bin/otablock
-
 # SELinux filesystem labels
 PRODUCT_COPY_FILES += \
     vendor/carbon/prebuilt/common/etc/init.d/50selinuxrelabel:system/etc/init.d/50selinuxrelabel

overlay/common/frameworks/base/core/res/res/values/config.xml

@@ -13,5 +13,11 @@
 
     <bool name="config_cellBroadcastAppLinks">true</bool>
 
+    <!-- Disable stock OTA components if installed -->
+    <string-array name="config_disabledComponents" translatable="false">
+        <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateActivity</item>
+        <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService</item>
+        <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService$Receiver</item>
+    </string-array>
 </resources>
 

prebuilt/common/etc/init.carbon.rc

@@ -50,12 +50,3 @@ service sysinit /system/bin/sysinit
     user root
     oneshot
     disabled
-
-# Block stock OTA activities
-service otablock /system/bin/otablock
-    user root
-    oneshot
-    disabled
-
-on property:dev.bootcomplete=1
-    start otablock