diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-10-03 20:33:28 +0100 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-11-23 15:28:41 -0800 |
| commit | 5afad60db65b9567861a844182a33b3668103312 (patch) | |
| tree | 7370235b2df1c5fc5c70a14a1a3c71ca32cde7a2 /src/com/android/settings/DeviceInfoSettings.java | |
| parent | 594dd8b9e590d67c301be67fd2eff9530be332d2 (diff) | |
| download | packages_apps_Settings-5afad60db65b9567861a844182a33b3668103312.zip packages_apps_Settings-5afad60db65b9567861a844182a33b3668103312.tar.gz packages_apps_Settings-5afad60db65b9567861a844182a33b3668103312.tar.bz2 | |
Settings: Add FOTA updater
Squashed commit of the following:
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Support the signed-builds FOTA updater, too
Change-Id: I2724881d6252ce7ce17ed9b3cfa94f6fecae1f7d
Author: Brint E. Kriebel <bekit@cyngn.com>
settings: Rename FOTA package
Change-Id: Ic1131261c275c15de308dded0aea36b61942a986
Change-Id: I2724881d6252ce7ce17ed9b3cfa94f6fecae1f7d
Diffstat (limited to 'src/com/android/settings/DeviceInfoSettings.java')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 0cccc01..3dc6446 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -180,6 +180,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_SYSTEM_UPDATE_SETTINGS, Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); + /* Make sure the activity is provided by who we want... */ + if (findPreference(KEY_SYSTEM_UPDATE_SETTINGS) != null) + removePreferenceIfPackageNotInstalled(findPreference(KEY_SYSTEM_UPDATE_SETTINGS)); } else { // Remove for secondary users removePreference(KEY_SYSTEM_UPDATE_SETTINGS); |