diff options
| author | Jason Monk <jmonk@google.com> | 2016-06-30 11:26:08 -0400 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-07-21 17:35:48 -0700 |
| commit | 2169505c9a9300ca564a39d218b80dcfefc76c2a (patch) | |
| tree | 298a8bd03edbd04fb3efed729f1e7dc7d50dca7a /src/com/android/settings/HelpUtils.java | |
| parent | 1edd645dd50fdbacd287af489ba0a4ad912bbd1c (diff) | |
| download | packages_apps_Settings-2169505c9a9300ca564a39d218b80dcfefc76c2a.zip packages_apps_Settings-2169505c9a9300ca564a39d218b80dcfefc76c2a.tar.gz packages_apps_Settings-2169505c9a9300ca564a39d218b80dcfefc76c2a.tar.bz2 | |
Pre-setup restrictions DO NOT MERGE
- Prevent external tiles from system apps
- Don't let user settings run
- Disable help
Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
Diffstat (limited to 'src/com/android/settings/HelpUtils.java')
| -rw-r--r-- | src/com/android/settings/HelpUtils.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java index 3c36edb..1b6cbf7 100644 --- a/src/com/android/settings/HelpUtils.java +++ b/src/com/android/settings/HelpUtils.java @@ -24,6 +24,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources.Theme; import android.net.Uri; +import android.provider.Settings.Global; import android.text.TextUtils; import android.util.Log; import android.util.TypedValue; @@ -90,6 +91,9 @@ public class HelpUtils { */ public static boolean prepareHelpMenuItem(final Activity activity, MenuItem helpMenuItem, String helpUriString, String backupContext) { + if (Global.getInt(activity.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) { + return false; + } if (TextUtils.isEmpty(helpUriString)) { // The help url string is empty or null, so set the help menu item to be invisible. helpMenuItem.setVisible(false); @@ -123,6 +127,9 @@ public class HelpUtils { public static Intent getHelpIntent(Context context, String helpUriString, String backupContext) { + if (Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) { + return null; + } // Try to handle as Intent Uri, otherwise just treat as Uri. try { Intent intent = Intent.parseUri(helpUriString, |