Merge "UI Tweak for eSIM related" into pi-dev

2018-03-20 19:24:59 +00:00
parent be3e5caa7f e0681db921
commit 2a6b9ff315
5 changed files with 42 additions and 11 deletions
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -357,7 +357,9 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
            return false;
        }
        ContentResolver cr = context.getContentResolver();
-        return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0;
+        return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0
+                ||  Settings.Global.getInt(
+                        cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
    }

    @VisibleForTesting