summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2017-12-13 08:35:28 (GMT)
committer Tellen Yu <tellen.yu@amlogic.com>2017-12-14 06:20:08 (GMT)
commitf55f2c08e6fe6b30cb14a43f89607457abd5b608 (patch)
treef13e346683218b42eec6cd22d5e144cbb692ab26
parente9493d50f67884373c59db322e908947008ab8d0 (diff)
downloadDroidTvSettings-f55f2c08e6fe6b30cb14a43f89607457abd5b608.zip
DroidTvSettings-f55f2c08e6fe6b30cb14a43f89607457abd5b608.tar.gz
DroidTvSettings-f55f2c08e6fe6b30cb14a43f89607457abd5b608.tar.bz2
bringup: config_carrierDemoModeSetting had been deleted in 8.1 [11/12]
PD# 156770 can not use the config_carrierDemoModeSetting from 8.1 Change-Id: I1efccbe0dd738a940af4fa7dd62a0883d1e94edf
Diffstat
-rw-r--r--src/com/droidlogic/tv/settings/Utils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/droidlogic/tv/settings/Utils.java b/src/com/droidlogic/tv/settings/Utils.java
index 5d2fe9d..1b4dd49 100644
--- a/src/com/droidlogic/tv/settings/Utils.java
+++ b/src/com/droidlogic/tv/settings/Utils.java
@@ -1235,7 +1235,7 @@ public final class Utils extends com.android.settingslib.Utils {
public static boolean isCarrierDemoUser(Context context) {
final String carrierDemoModeSetting =
- context.getString(com.android.internal.R.string.config_carrierDemoModeSetting);
+ "";//context.getString(com.android.internal.R.string.config_carrierDemoModeSetting);
return UserManager.isDeviceInDemoMode(context)
&& getUserManager(context).isDemoUser()
&& !TextUtils.isEmpty(carrierDemoModeSetting)