From 194e4153844267634e44c4feada9670c8f433ccd Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 6 Jul 2016 17:49:37 -0700 Subject: [PATCH] Enable the demo launcher package as well. Bug: 29922954 Change-Id: I81ad01d9ca5e3505df716bde2506e0f1e7f7a6b7 --- .../java/com/android/server/pm/UserManagerService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index bbffd328eecd1..5bba25fbe4533 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -38,6 +38,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.IntentSender; +import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.UserInfo; @@ -2919,10 +2920,15 @@ public class UserManagerService extends IUserManager.Stub { com.android.internal.R.string.config_demoModeLauncherComponent); if (!TextUtils.isEmpty(demoLauncher)) { ComponentName componentToEnable = ComponentName.unflattenFromString(demoLauncher); + String demoLauncherPkg = componentToEnable.getPackageName(); try { - AppGlobals.getPackageManager().setComponentEnabledSetting(componentToEnable, + final IPackageManager iPm = AppGlobals.getPackageManager(); + iPm.setComponentEnabledSetting(componentToEnable, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, /* flags= */ 0, /* userId= */ userId); + iPm.setApplicationEnabledSetting(demoLauncherPkg, + PackageManager.COMPONENT_ENABLED_STATE_ENABLED, /* flags= */ 0, + /* userId= */ userId, null); } catch (RemoteException re) { // Internal, shouldn't happen }