Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting."" (391dfcfa) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+2 −15

Original line number	Diff line number	Diff line
		@@ -2080,14 +2080,8 @@ public class ApplicationPackageManager extends PackageManager {
		@Override
		public void setComponentEnabledSetting(ComponentName componentName,
		int newState, int flags) {
		setComponentEnabledSettingAsUser(componentName, newState, flags, mContext.getUserId());
		}

		@Override
		public void setComponentEnabledSettingAsUser(ComponentName componentName,
		int newState, int flags, int userId) {
		try {
		mPM.setComponentEnabledSetting(componentName, newState, flags, userId);
		mPM.setComponentEnabledSetting(componentName, newState, flags, mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -2105,16 +2099,9 @@ public class ApplicationPackageManager extends PackageManager {
		@Override
		public void setApplicationEnabledSetting(String packageName,
		int newState, int flags) {
		setApplicationEnabledSettingAsUser(packageName, newState, flags,
		mContext.getUserId());
		}

		@Override
		public void setApplicationEnabledSettingAsUser(String packageName,
		int newState, int flags, int userId) {
		try {
		mPM.setApplicationEnabledSetting(packageName, newState, flags,
		userId, mContext.getOpPackageName());
		mContext.getUserId(), mContext.getOpPackageName());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/content/pm/PackageManager.java

+0 −16

Original line number	Diff line number	Diff line
		@@ -5378,14 +5378,6 @@ public abstract class PackageManager {
		public abstract void setComponentEnabledSetting(ComponentName componentName,
		int newState, int flags);

		/**
		* Per-user version of {@link #setComponentEnabledSetting(ComponentName, int, int)}
		*
		* @hide
		*/
		public abstract void setComponentEnabledSettingAsUser(ComponentName componentName,
		int newState, int flags, int userId);

		/**
		* Return the enabled setting for a package component (activity,
		* receiver, service, provider). This returns the last value set by
		@@ -5424,14 +5416,6 @@ public abstract class PackageManager {
		public abstract void setApplicationEnabledSetting(String packageName,
		int newState, int flags);

		/**
		* Per-user version of {@link #setApplicationEnabledSetting(String, int, int)}
		*
		* @hide
		*/
		public abstract void setApplicationEnabledSettingAsUser(String packageName,
		int newState, int flags, int userId);

		/**
		* Return the enabled setting for an application. This returns
		* the last value set by

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

+13 −7

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.app.Activity;
		import android.app.ActivityManager;
		import android.app.ActivityManagerInternal;
		import android.app.ActivityManagerNative;
		import android.app.AppGlobals;
		import android.app.IActivityManager;
		import android.app.IStopUserCallback;
		import android.app.KeyguardManager;
		@@ -37,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;
		@@ -2940,13 +2942,17 @@ public class UserManagerService extends IUserManager.Stub {
		if (!TextUtils.isEmpty(demoLauncher)) {
		ComponentName componentToEnable = ComponentName.unflattenFromString(demoLauncher);
		String demoLauncherPkg = componentToEnable.getPackageName();
		final PackageManager pm = mContext.getPackageManager();
		pm.setComponentEnabledSettingAsUser(componentToEnable,
		try {
		final IPackageManager iPm = AppGlobals.getPackageManager();
		iPm.setComponentEnabledSetting(componentToEnable,
		PackageManager.COMPONENT_ENABLED_STATE_ENABLED, /* flags= */ 0,
		/* userId= */ userId);
		pm.setApplicationEnabledSettingAsUser(demoLauncherPkg,
		iPm.setApplicationEnabledSetting(demoLauncherPkg,
		PackageManager.COMPONENT_ENABLED_STATE_ENABLED, /* flags= */ 0,
		/* userId= */ userId);
		/* userId= */ userId, null);
		} catch (RemoteException re) {
		// Internal, shouldn't happen
		}
		}
		}
		}

test-runner/src/android/test/mock/MockPackageManager.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -752,13 +752,6 @@ public class MockPackageManager extends PackageManager {
		throw new UnsupportedOperationException();
		}

		/** @hide - hidden in superclass */
		@Override
		public void setComponentEnabledSettingAsUser(ComponentName componentName,
		int newState, int flags, int userId) {
		throw new UnsupportedOperationException();
		}

		@Override
		public int getComponentEnabledSetting(ComponentName componentName) {
		throw new UnsupportedOperationException();
		@@ -769,13 +762,6 @@ public class MockPackageManager extends PackageManager {
		throw new UnsupportedOperationException();
		}

		/** @hide - hidden in superclass */
		@Override
		public void setApplicationEnabledSettingAsUser(String packageName, int newState, int flags,
		int userId) {
		throw new UnsupportedOperationException();
		}

		@Override
		public int getApplicationEnabledSetting(String packageName) {
		throw new UnsupportedOperationException();

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -711,11 +711,6 @@ public class BridgePackageManager extends PackageManager {
		public void setComponentEnabledSetting(ComponentName componentName, int newState, int flags) {
		}

		@Override
		public void setComponentEnabledSettingAsUser(ComponentName componentName, int newState,
		int flags, int userId) {
		}

		@Override
		public int getComponentEnabledSetting(ComponentName componentName) {
		return 0;
		@@ -725,11 +720,6 @@ public class BridgePackageManager extends PackageManager {
		public void setApplicationEnabledSetting(String packageName, int newState, int flags) {
		}

		@Override
		public void setApplicationEnabledSettingAsUser(String packageName, int newState, int flags,
		int userId) {
		}

		@Override
		public int getApplicationEnabledSetting(String packageName) {
		return 0;