Merge "add Kindle Fire contributor" into cm-10.2
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 58343e5..37aa557 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -89,25 +89,23 @@
Translators:
------------
* __Afrikaans:__ Corrie Meyer, David van Tonder
-* __Catalan:__ Oriol Pellicer
-* __Croatian:__ Antonio Marin
+* __Catalan:__ Arnau Llovet Vidal
+* __Chinese (Simplified):__ Andrew Jiang, John Hsing, Engle Mars
+* __Chinese (Traditional):__ Li Chi Tung, Fu-Chun Hsu
* __Czech:__ Ondrej Zima, Radovan Kepak, Pavel Kucera, Jozka Jozin, Jiri Silvarich, Vaclav Moucha
-* __Dutch:__ Marco Brohet, Kasper Hettinga, Sam Segers, Bart Tiemersma, Eddy Witkamp
-* __Finnish:__ Antti Leukkunen, Niko Koivu
-* __French:__ Sébastien Vaucher, David Girault, Tanguy Pruvot
-* __German:__ Kim Lê, Jacob Müller, Patrick Schaaf, Christoph Quiter, Markus Hoeber, Matthias Büchner, Danny Baumann
-* __Greek:__ Michael Bestas
+* __Danish:__ Jacob Overgaard Madsen, Morten Jørgensen, Henning Nielsen Lund, Mikael Jepsen
+* __Dutch:__ Marco Brohet, Kasper Hettinga, Eddy Witkamp
+* __Finnish:__ Niko Koivu
+* __French:__ Delphin PETER, Eric Mourougandy, Léo Colombaro, Florent Imfloflo, Tanguy Pruvot, Matthias Bosc
+* __German:__ Kim Lê, Jacob Müller, Christoph Quiter, Markus Hoeber, Danny Baumann
+* __Greek:__ Michael Bestas, Vasilis Akritas
* __Hungarian:__ Tamás Tóth, Dávid László, Dániel Buga
-* __Italian:__ Francesco Foresta, Moreno Pojer, Eugenio Ziliotto, Giulio Cervera, Mauro Bazzano
-* __Japanese:__ Takuo Kitame
-* __Korean:__ Inseok Lee
-* __Polish:__ Maciej Rozbicki
-* __Portuguese-Brazil:__ Gustavo Rosa
-* __Portuguese:__ Eduardo Martins, Ricardo Pinho
-* __Russian:__ OlegKrikun, Pavel Volkov, Kir Kolyshkin
-* __Simplified Chinese:__ comercy, Qian Zheng, Andrew Jiang, John Hsing
-* __Slovak:__ Juraj Janecek
-* __Spanish:__ PeRiJeY, KalimochoAz, Chuckycrx, Jorge Ruesga, djMesias
-* __Swedish:__ Patrik Kullman
-* __Traditional Chinese:__ Ladios Jonquil
-* __Turkish:__ Ethem Evlice (androidmeda)
+* __Italian:__ Francesco Foresta, Mauro Bazzano
+* __Japanese:__ Takuo Kitame, Taichi Nishimura
+* __Norwegian:__ Odin Ugedal, Arne Coucheron
+* __Polish:__ Tomasz Popielarczyk c.s.
+* __Portuguese (Brazilian):__ Gustavo Rosa, Pedro Carneiro, Emerson Pinter
+* __Russian:__ Pavel Volkov, Vladislav Koldobskiy, Vladimir Belkov
+* __Slovak:__ Dusan Kazik
+* __Spanish:__ Jorge Ruesga, Lorenzo M. Castaño
+* __Swedish:__ Simon Bäck, Ted Lundwall, Esa Laukkanen, Björn Lundén
diff --git a/config/common.mk b/config/common.mk
index 96f0ceb..a204f9b 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -112,10 +112,6 @@
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 c9c79da..9cdc8ea 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -49,12 +49,3 @@
user root
oneshot
disabled
-
-# Block stock OTA activities
-service otablock /system/bin/otablock
- user root
- oneshot
- disabled
-
-on property:dev.bootcomplete=1
- start otablock