Merge \"More thorough cleansing of expired users\" into nyc-dev (c5ffdb9e) · Commits · e / os / android_frameworks_base

core/java/android/content/Context.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3643,6 +3643,12 @@ public abstract class Context {
	*/		*/
	public static final String SYSTEM_HEALTH_SERVICE = "systemhealth";		public static final String SYSTEM_HEALTH_SERVICE = "systemhealth";

			/**
			* Gatekeeper Service.
			* @hide
			*/
			public static final String GATEKEEPER_SERVICE = "android.service.gatekeeper.IGateKeeperService";

	/**		/**
	* Determine whether the given permission is allowed for a particular		* Determine whether the given permission is allowed for a particular
	* process and user ID running in the system.		* process and user ID running in the system.

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -240,6 +240,22 @@ public class Environment {
	return new File(getDataDirectory(), "system");		return new File(getDataDirectory(), "system");
	}		}

			/**
			* Returns the base directory for per-user system directory, device encrypted.
			* {@hide}
			*/
			public static File getDataSystemDeDirectory() {
			return buildPath(getDataDirectory(), "system_de");
			}

			/**
			* Returns the base directory for per-user system directory, credential encrypted.
			* {@hide}
			*/
			public static File getDataSystemCeDirectory() {
			return buildPath(getDataDirectory(), "system_ce");
			}

	/** {@hide} */		/** {@hide} */
	public static File getDataSystemCeDirectory(int userId) {		public static File getDataSystemCeDirectory(int userId) {
	return buildPath(getDataDirectory(), "system_ce", String.valueOf(userId));		return buildPath(getDataDirectory(), "system_ce", String.valueOf(userId));

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1508,7 +1508,9 @@ public class UserManager {
	}		}

	/**		/**
	* Returns information for all users on this device.		* Returns information for all users on this device, including ones marked for deletion.
			* To retrieve only users that are alive, use {@link #getUsers(boolean)}.
			* <p>
	* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.		* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
	* @return the list of users that exist on the device.		* @return the list of users that exist on the device.
	* @hide		* @hide

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.security;		package android.security;

			import android.content.Context;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.os.ServiceManager;		import android.os.ServiceManager;
	import android.os.UserHandle;		import android.os.UserHandle;
	@@ -32,7 +33,7 @@ public abstract class GateKeeper {

	public static IGateKeeperService getService() {		public static IGateKeeperService getService() {
	IGateKeeperService service = IGateKeeperService.Stub.asInterface(		IGateKeeperService service = IGateKeeperService.Stub.asInterface(
	ServiceManager.getService("android.service.gatekeeper.IGateKeeperService"));		ServiceManager.getService(Context.GATEKEEPER_SERVICE));
	if (service == null) {		if (service == null) {
	throw new IllegalStateException("Gatekeeper service not available");		throw new IllegalStateException("Gatekeeper service not available");
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1588,7 +1588,7 @@ public class LockSettingsService extends ILockSettings.Stub {
	}		}

	final IBinder service =		final IBinder service =
	ServiceManager.getService("android.service.gatekeeper.IGateKeeperService");		ServiceManager.getService(Context.GATEKEEPER_SERVICE);
	if (service != null) {		if (service != null) {
	service.linkToDeath(new GateKeeperDiedRecipient(), 0);		service.linkToDeath(new GateKeeperDiedRecipient(), 0);
	mGateKeeperService = IGateKeeperService.Stub.asInterface(service);		mGateKeeperService = IGateKeeperService.Stub.asInterface(service);