diff options
author | Luis Vidal <lvidal@cyngn.com> | 2016-02-23 15:11:36 -0800 |
---|---|---|
committer | Luis Vidal <lvidal@cyngn.com> | 2016-02-23 15:47:16 -0800 |
commit | 42a60b273e2d4188a0895fa2b0d463cda8b06b54 (patch) | |
tree | 948ff25fe74d69c403a1fab0ff38b944aa109a74 /src/com/android | |
parent | dd6bee9ec6f85bed5469b31e04b10363e7eb844d (diff) | |
download | android_packages_apps_CellBroadcastReceiver-42a60b273e2d4188a0895fa2b0d463cda8b06b54.tar.gz android_packages_apps_CellBroadcastReceiver-42a60b273e2d4188a0895fa2b0d463cda8b06b54.tar.bz2 android_packages_apps_CellBroadcastReceiver-42a60b273e2d4188a0895fa2b0d463cda8b06b54.zip |
Hide CMAS dev options in user builds
CMAS dev options will be visible only on engineering or
userdebug builds.
Change-Id: Ifc36cb1184e4148af967abbab3b6bbc8f3e9e101
TICKET: CYNGNOS-2135
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java index 2e83dbcc..cc0d16b3 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java @@ -17,6 +17,7 @@ package com.android.cellbroadcastreceiver; import android.content.Context; +import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserManager; @@ -200,6 +201,14 @@ public class CellBroadcastSettings extends PreferenceActivity { mAlertCategory = (PreferenceCategory) findPreference(KEY_CATEGORY_ALERT_SETTINGS); + // Show extra settings when developer options is enabled in settings + // AND build type is not user + boolean enableDevSettings = false; + if (!Build.TYPE.equals("user")) { + enableDevSettings = Settings.Global.getInt(getContentResolver(), + Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0; + } + if(mSir == null) { mExtremeCheckBox.setEnabled(false); mSevereCheckBox.setEnabled(false); @@ -213,6 +222,11 @@ public class CellBroadcastSettings extends PreferenceActivity { mChannel50CheckBox.setEnabled(false); mCmasCheckBox.setEnabled(false); mOptOutCheckBox.setEnabled(false); + if (!enableDevSettings) { + PreferenceCategory devSettingCategory = + (PreferenceCategory) findPreference(KEY_CATEGORY_DEV_SETTINGS); + if (devSettingCategory != null) prefScreen.removePreference(devSettingCategory); + } return; } @@ -289,10 +303,6 @@ public class CellBroadcastSettings extends PreferenceActivity { } }; - // Show extra settings when developer options is enabled in settings. - boolean enableDevSettings = Settings.Global.getInt(getContentResolver(), - Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0; - boolean showEtwsSettings = SubscriptionManager.getResourcesForSubId( getApplicationContext(), mSir.getSubscriptionId()) .getBoolean(R.bool.show_etws_settings); |