Merge "Slight API renaming, better behavior." (98cb23dc) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −12

api/system-current.txt

+14 −12

api/test-current.txt

+8 −12

core/java/android/app/ContextImpl.java

+22 −20

Original line number	Original line	Diff line number	Diff line
	@@ -61,6 +61,7 @@ import android.os.RemoteException;
	import android.os.ServiceManager;		import android.os.ServiceManager;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.os.storage.IMountService;		import android.os.storage.IMountService;
			import android.os.storage.StorageManager;
	import android.util.AndroidRuntimeException;		import android.util.AndroidRuntimeException;
	import android.util.ArrayMap;		import android.util.ArrayMap;
	import android.util.Log;		import android.util.Log;
	@@ -1744,17 +1745,21 @@ class ContextImpl extends Context {
	}		}

	@Override		@Override
	public Context createDeviceEncryptedContext(Context context) {		public Context createDeviceEncryptedStorageContext() {
	final int flags = (mFlags & ~Context.CONTEXT_STORAGE_CREDENTIAL_ENCRYPTED)		if (!StorageManager.isFileBasedEncryptionEnabled()) {
	\| Context.CONTEXT_STORAGE_DEVICE_ENCRYPTED;		return null;
			}

			final int flags = (mFlags & ~Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE)
			\| Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE;
	return new ContextImpl(this, mMainThread, mPackageInfo, mActivityToken,		return new ContextImpl(this, mMainThread, mPackageInfo, mActivityToken,
	mUser, flags, mDisplay, null, Display.INVALID_DISPLAY);		mUser, flags, mDisplay, null, Display.INVALID_DISPLAY);
	}		}

	@Override		@Override
	public Context createCredentialEncryptedContext(Context context) {		public Context createCredentialEncryptedStorageContext() {
	final int flags = (mFlags & ~Context.CONTEXT_STORAGE_DEVICE_ENCRYPTED)		final int flags = (mFlags & ~Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE)
	\| Context.CONTEXT_STORAGE_CREDENTIAL_ENCRYPTED;		\| Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE;
	return new ContextImpl(this, mMainThread, mPackageInfo, mActivityToken,		return new ContextImpl(this, mMainThread, mPackageInfo, mActivityToken,
	mUser, flags, mDisplay, null, Display.INVALID_DISPLAY);		mUser, flags, mDisplay, null, Display.INVALID_DISPLAY);
	}		}
	@@ -1765,13 +1770,13 @@ class ContextImpl extends Context {
	}		}

	@Override		@Override
	public boolean isDeviceEncrypted() {		public boolean isDeviceEncryptedStorage() {
	return (mFlags & Context.CONTEXT_STORAGE_DEVICE_ENCRYPTED) != 0;		return (mFlags & Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE) != 0;
	}		}

	@Override		@Override
	public boolean isCredentialEncrypted() {		public boolean isCredentialEncryptedStorage() {
	return (mFlags & Context.CONTEXT_STORAGE_CREDENTIAL_ENCRYPTED) != 0;		return (mFlags & Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE) != 0;
	}		}

	@Override		@Override
	@@ -1781,13 +1786,12 @@ class ContextImpl extends Context {

	private File getDataDirFile() {		private File getDataDirFile() {
	if (mPackageInfo != null) {		if (mPackageInfo != null) {
	if (isCredentialEncrypted()) {		if (isCredentialEncryptedStorage()) {
	return mPackageInfo.getCredentialEncryptedDataDirFile();		return mPackageInfo.getCredentialEncryptedDataDirFile();
	} else if (isDeviceEncrypted()) {		} else if (isDeviceEncryptedStorage()) {
	return mPackageInfo.getDeviceEncryptedDataDirFile();		return mPackageInfo.getDeviceEncryptedDataDirFile();
	} else {		} else {
	throw new RuntimeException(		return mPackageInfo.getDataDirFile();
	"Storage location is neither credential nor device encrypted");
	}		}
	}		}
	throw new RuntimeException("Not supported in system context");		throw new RuntimeException("Not supported in system context");
	@@ -1840,15 +1844,13 @@ class ContextImpl extends Context {

	// If creator didn't specify which storage to use, use the default		// If creator didn't specify which storage to use, use the default
	// location for application.		// location for application.
	if ((flags & Context.CONTEXT_STORAGE_MASK) == 0) {		if ((flags & (Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE
			\| Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE)) == 0) {
	final File dataDir = packageInfo.getDataDirFile();		final File dataDir = packageInfo.getDataDirFile();
	if (Objects.equals(dataDir, packageInfo.getCredentialEncryptedDataDirFile())) {		if (Objects.equals(dataDir, packageInfo.getCredentialEncryptedDataDirFile())) {
	flags \|= Context.CONTEXT_STORAGE_CREDENTIAL_ENCRYPTED;		flags \|= Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE;
	} else if (Objects.equals(dataDir, packageInfo.getDeviceEncryptedDataDirFile())) {		} else if (Objects.equals(dataDir, packageInfo.getDeviceEncryptedDataDirFile())) {
	flags \|= Context.CONTEXT_STORAGE_DEVICE_ENCRYPTED;		flags \|= Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE;
	} else {
	throw new IllegalStateException("Storage location " + dataDir
	+ " doesn't match either credential or device encrypted storage");
	}		}
	}		}

core/java/android/content/Context.java

+23 −19

Original line number	Original line	Diff line number	Diff line
	@@ -53,8 +53,8 @@ import android.os.UserHandle;
	import android.os.UserManager;		import android.os.UserManager;
	import android.provider.MediaStore;		import android.provider.MediaStore;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	import android.view.DisplayAdjustments;
	import android.view.Display;		import android.view.Display;
			import android.view.DisplayAdjustments;
	import android.view.ViewDebug;		import android.view.ViewDebug;
	import android.view.WindowManager;		import android.view.WindowManager;

	@@ -3870,7 +3870,7 @@ public abstract class Context {
	*		*
	* @hide		* @hide
	*/		*/
	public static final int CONTEXT_STORAGE_DEVICE_ENCRYPTED = 0x00000008;		public static final int CONTEXT_DEVICE_ENCRYPTED_STORAGE = 0x00000008;

	/**		/**
	* Flag for use with {@link #createPackageContext}: point all file APIs at		* Flag for use with {@link #createPackageContext}: point all file APIs at
	@@ -3878,11 +3878,7 @@ public abstract class Context {
	*		*
	* @hide		* @hide
	*/		*/
	public static final int CONTEXT_STORAGE_CREDENTIAL_ENCRYPTED = 0x00000010;		public static final int CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE = 0x00000010;

	/** {@hide} */
	public static final int CONTEXT_STORAGE_MASK = CONTEXT_STORAGE_DEVICE_ENCRYPTED
	\| CONTEXT_STORAGE_CREDENTIAL_ENCRYPTED;

	/**		/**
	* @hide Used to indicate we should tell the activity manager about the process		* @hide Used to indicate we should tell the activity manager about the process
	@@ -3987,19 +3983,23 @@ public abstract class Context {
	* Return a new Context object for the current Context but whose storage		* Return a new Context object for the current Context but whose storage
	* APIs are backed by device-encrypted storage.		* APIs are backed by device-encrypted storage.
	* <p>		* <p>
	* Data stored in device-encrypted storage is typically encrypted with a		* Data stored in device-encrypted storage is typically encrypted with a key
	* key tied to the physical device, and they can be accessed whenever the		* tied to the physical device, and it can be accessed when the device has
	* device has booted successfully, both <em>before and after</em> the user		* booted successfully, both <em>before and after</em> the user has
	* has entered their credentials (such as a lock pattern or PIN).		* authenticated with their credentials (such as a lock pattern or PIN).
			* Because device-encrypted data is available before user authentication,
			* you should carefully consider what data you store using this Context.
	* <p>		* <p>
	* Each call to this method returns a new instance of a Context object;		* Each call to this method returns a new instance of a Context object;
	* Context objects are not shared, however common state (ClassLoader, other		* Context objects are not shared, however common state (ClassLoader, other
	* Resources for the same configuration) may be so the Context itself can be		* Resources for the same configuration) may be so the Context itself can be
	* fairly lightweight.		* fairly lightweight.
	*		*
	* @see #isDeviceEncrypted()		* @return new Context or {@code null} if device-encrypted storage is not
			* supported or available on this device.
			* @see #isDeviceEncryptedStorage()
	*/		*/
	public abstract Context createDeviceEncryptedContext(Context context);		public abstract Context createDeviceEncryptedStorageContext();

	/**		/**
	* Return a new Context object for the current Context but whose storage		* Return a new Context object for the current Context but whose storage
	@@ -4015,9 +4015,11 @@ public abstract class Context {
	* Resources for the same configuration) may be so the Context itself can be		* Resources for the same configuration) may be so the Context itself can be
	* fairly lightweight.		* fairly lightweight.
	*		*
	* @see #isCredentialEncrypted()		* @see #isCredentialEncryptedStorage()
			* @hide
	*/		*/
	public abstract Context createCredentialEncryptedContext(Context context);		@SystemApi
			public abstract Context createCredentialEncryptedStorageContext();

	/**		/**
	* Gets the display adjustments holder for this context. This information		* Gets the display adjustments holder for this context. This information
	@@ -4045,15 +4047,17 @@ public abstract class Context {
	* Indicates if the storage APIs of this Context are backed by		* Indicates if the storage APIs of this Context are backed by
	* device-encrypted storage.		* device-encrypted storage.
	*		*
	* @see #createDeviceEncryptedContext(Context)		* @see #createDeviceEncryptedStorageContext()
	*/		*/
	public abstract boolean isDeviceEncrypted();		public abstract boolean isDeviceEncryptedStorage();

	/**		/**
	* Indicates if the storage APIs of this Context are backed by		* Indicates if the storage APIs of this Context are backed by
	* credential-encrypted storage.		* credential-encrypted storage.
	*		*
	* @see #createCredentialEncryptedContext(Context)		* @see #createCredentialEncryptedStorageContext()
			* @hide
	*/		*/
	public abstract boolean isCredentialEncrypted();		@SystemApi
			public abstract boolean isCredentialEncryptedStorage();
	}		}