diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-09-01 16:07:57 +0700 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-09-01 16:18:35 +0100 |
| commit | 8b9f177f00274a64db5f33f82cb0889c1be16034 (patch) | |
| tree | 436b46eeedafd25e2b1541840225fd6743c31997 | |
| parent | eb7754adb6c37a40f1ef52e21007170830c978ef (diff) | |
| download | vendor_replicant-8b9f177f00274a64db5f33f82cb0889c1be16034.zip vendor_replicant-8b9f177f00274a64db5f33f82cb0889c1be16034.tar.gz vendor_replicant-8b9f177f00274a64db5f33f82cb0889c1be16034.tar.bz2 | |
Use Package Manager to disable stock OTA
This reverts commit ea14a88a2ac567104f267fda5a4507d0ae48040c.
Using the Package Manager prevents any danling wakelock from
killed service/receiver.
Change-Id: Ie3162ca4b18a7bc9c55613af39e88ea980407e5f
| -rw-r--r-- | config/common.mk | 4 | ||||
| -rw-r--r-- | overlay/common/frameworks/base/core/res/res/values/config.xml | 6 | ||||
| -rw-r--r-- | prebuilt/common/bin/otablock | 10 | ||||
| -rw-r--r-- | prebuilt/common/etc/init.local.rc | 9 |
4 files changed, 6 insertions, 23 deletions
diff --git a/config/common.mk b/config/common.mk index a385b4f..06b0912 100644 --- a/config/common.mk +++ b/config/common.mk @@ -108,10 +108,6 @@ PRODUCT_COPY_FILES += \ vendor/cm/prebuilt/common/bin/compcache:system/bin/compcache \ vendor/cm/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache -# block stock OTAs -PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bin/otablock:system/bin/otablock - # Terminal Emulator PRODUCT_COPY_FILES += \ vendor/cm/proprietary/Term.apk:system/app/Term.apk \ diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml index 4600e22..9ce3a74 100644 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -19,5 +19,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> diff --git a/prebuilt/common/bin/otablock b/prebuilt/common/bin/otablock deleted file mode 100644 index 62dbd1b..0000000 --- a/prebuilt/common/bin/otablock +++ /dev/null @@ -1,10 +0,0 @@ -#!/system/bin/sh - - -## If these activities are installed, get rid of them. We don't want updates -## coming in from outside CM - -exec 2>/dev/null -pm disable com.google.android.gsf/com.google.android.gsf.update.SystemUpdateActivity -pm disable com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService -pm disable com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService\$Receiver diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc index 5e34187..d62c1c2 100644 --- a/prebuilt/common/etc/init.local.rc +++ b/prebuilt/common/etc/init.local.rc @@ -48,12 +48,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 |