summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Johnson <zachoverflow@google.com>2018-03-30 14:32:52 -0700
committerZach Johnson <zachoverflow@google.com>2018-03-30 21:38:26 +0000
commit27cb5feaac54085e21a452919a4328fce1701002 (patch)
tree6ec907387e760edd7760ea31daecf14c7a1a3434
parent1a09b32095cdf48c953a5eca630e5d39a7bac2ee (diff)
downloadCellBroadcastReceiver-27cb5feaac54085e21a452919a4328fce1701002.tar.gz
Fetch category_alert_preferences specifically for phones
The key is overloaded between watches & phones. On phones it is a PreferenceCategory and on watches it is a PreferenceScreen. Avoid cast crash by only fetching it as a PreferenceCategory if running on a phone. Bug: 72623900 Test: manual, does not crash anymore Change-Id: Ic0c7943bd68b7e6354f3aacee00178a88ab3a6e6
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index 959131610..25503cb97 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -203,8 +203,6 @@ public class CellBroadcastSettings extends Activity {
mTestCheckBox = (TwoStatePreference)
findPreference(KEY_ENABLE_TEST_ALERTS);
mAlertHistory = findPreference(KEY_EMERGENCY_ALERT_HISTORY);
- mAlertPreferencesCategory = (PreferenceCategory)
- findPreference(KEY_CATEGORY_ALERT_PREFERENCES);
mDevSettingCategory = (PreferenceCategory)
findPreference(KEY_CATEGORY_DEV_SETTINGS);
@@ -229,6 +227,8 @@ public class CellBroadcastSettings extends Activity {
findPreference(KEY_CATEGORY_ALERT_PREFERENCES);
watchScreen.removePreference(mReminderInterval);
} else {
+ mAlertPreferencesCategory = (PreferenceCategory)
+ findPreference(KEY_CATEGORY_ALERT_PREFERENCES);
mAlertCategory = (PreferenceCategory)
findPreference(KEY_CATEGORY_EMERGENCY_ALERTS);
}