PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable managed profile version of shortcut picker." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-17 17:38:29 +00:00
committed by Android (Google) Code Review
parent 09dbc8043f 4761da3b73
commit c760135f14
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/SettingsInitialize.java
View File

@@ -35,7 +35,7 @@ import static android.content.pm.PackageManager.GET_RESOLVED_FILTER;
import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
/**
* Listens to {@link Intent.ACTION_BOOT_COMPLETED} and {@link Intent.ACTION_PRE_BOOT_COMPLETED}
* Listens to {@link Intent.ACTION_PRE_BOOT_COMPLETED} and {@link Intent.ACTION_USER_INITIALIZED}
* performs setup steps for a managed profile (disables the launcher icon of the Settings app,
* adds cross-profile intent filters for the appropriate Settings activities), and disables the
* webview setting for non-admin users.
@@ -89,11 +89,13 @@ public class SettingsInitialize extends BroadcastReceiver {
}
// Disable launcher icon
// Note: This needs to happen after forwarding intents, otherwise the main Settings
// intent gets lost
ComponentName settingsComponentName = new ComponentName(context, Settings.class);
pm.setComponentEnabledSetting(settingsComponentName,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
// Disable shortcut picker.
ComponentName shortcutComponentName = new ComponentName(context, CreateShortcut.class);
pm.setComponentEnabledSetting(shortcutComponentName,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
}
// Disable WebView Setting if the current user is not an admin