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
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user