diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2013-07-26 20:19:25 +0200 |
|---|---|---|
| committer | Jorge Ruesga <jorge@ruesga.com> | 2013-07-26 20:21:22 +0200 |
| commit | b0706993a5fd3e9a01e52d3bce4ce2e54120de6c (patch) | |
| tree | 2df6bdc99b941a80848a72177a7bc29ba9a90c16 /src | |
| parent | 5a29d4365a177b80fc1b912a9100d34d14cbc672 (diff) | |
| download | packages_apps_settings-b0706993a5fd3e9a01e52d3bce4ce2e54120de6c.zip packages_apps_settings-b0706993a5fd3e9a01e52d3bce4ce2e54120de6c.tar.gz packages_apps_settings-b0706993a5fd3e9a01e52d3bce4ce2e54120de6c.tar.bz2 | |
CellBroadcast: Disable App links on wifi-only devices
PatchSet 2: Remove unnecessary check
Change-Id: I359b5fef2932dfa072b72384edf9ba730a1f71a1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 10d9214..edf5bc1 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -180,18 +180,22 @@ public class WirelessSettings extends SettingsPreferenceFragment { } // Enable link to CMAS app settings depending on the value in config.xml. - boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean( - com.android.internal.R.bool.config_cellBroadcastAppLinks); - try { - if (isCellBroadcastAppLinkEnabled) { - PackageManager pm = getPackageManager(); - if (pm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver") - == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) { - isCellBroadcastAppLinkEnabled = false; // CMAS app disabled + PackageManager pm = getPackageManager(); + boolean hasPhoneFeatures = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY); + boolean isCellBroadcastAppLinkEnabled = false; + if (hasPhoneFeatures) { + isCellBroadcastAppLinkEnabled = this.getResources().getBoolean( + com.android.internal.R.bool.config_cellBroadcastAppLinks); + try { + if (isCellBroadcastAppLinkEnabled) { + if (pm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver") + == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) { + isCellBroadcastAppLinkEnabled = false; // CMAS app disabled + } } + } catch (IllegalArgumentException ignored) { + isCellBroadcastAppLinkEnabled = false; // CMAS app not installed } - } catch (IllegalArgumentException ignored) { - isCellBroadcastAppLinkEnabled = false; // CMAS app not installed } if (isSecondaryUser || !isCellBroadcastAppLinkEnabled) { PreferenceScreen root = getPreferenceScreen(); |