summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ResetNetwork.java
diff options
context:
space:
mode:
authorTaesu Lee <taesu82.lee@samsung.com>2019-07-22 19:20:05 +0900
committerTaesu Lee <taesu82.lee@samsung.com>2019-09-06 16:11:39 +0900
commit39e4fbb746801df3f26851a24260fa05e2424658 (patch)
tree640ebf9365063a9796b66372e4ba487396e7817a /src/com/android/settings/ResetNetwork.java
parentd7a8e234e9b94ff36cd271555a0bbf8a01a10932 (diff)
downloadpackages_apps_Settings-39e4fbb746801df3f26851a24260fa05e2424658.tar.gz
packages_apps_Settings-39e4fbb746801df3f26851a24260fa05e2424658.tar.bz2
packages_apps_Settings-39e4fbb746801df3f26851a24260fa05e2424658.zip
Fix to show eUICC preference in eng build
DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer options in settings app even if it is in eng build. To show eUICC preference in eng build, uses isDevelopmentSettingsEnabled() instead. Test: Manual and make RunSettingsRoboTests Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Diffstat (limited to 'src/com/android/settings/ResetNetwork.java')
-rw-r--r--src/com/android/settings/ResetNetwork.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 424d976e90..4fbc09db9b 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -52,6 +52,7 @@ import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
import java.util.ArrayList;
import java.util.List;
@@ -236,7 +237,7 @@ public class ResetNetwork extends InstrumentedFragment {
}
ContentResolver resolver = context.getContentResolver();
return Settings.Global.getInt(resolver, Global.EUICC_PROVISIONED, 0) != 0
- || Settings.Global.getInt(resolver, Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+ || DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
}
@Override