Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b567da41 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge \\"Enable the demo launcher package as well.\\" into nyc-mr1-dev am: b5b2c196 

am: be22429b

Change-Id: Iba60a6a38d756141328597be8098eec6a0e24926
parents d9b51331 be22429b

services/core/java/com/android/server/pm/UserManagerService.java

+7 −1
Original line number Diff line number Diff line
@@ -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

                }