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

Commit a903fd76 authored Mar 18, 2016 by Jeff Sharkey Committed by android-build-merger Mar 18, 2016

Merge "Update direct boot related documentation." into nyc-dev

am: 2a4e4954

* commit '2a4e4954':
  Update direct boot related documentation.

parents 199ef2f1 2a4e4954

api/current.txt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8017,8 +8017,6 @@ package android.content {
	method public abstract java.lang.String getPackageResourcePath();		method public abstract java.lang.String getPackageResourcePath();
	method public abstract android.content.res.Resources getResources();		method public abstract android.content.res.Resources getResources();
	method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);		method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
	method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
	method public abstract java.io.File getSharedPreferencesPath(java.lang.String);
	method public final java.lang.String getString(int);		method public final java.lang.String getString(int);
	method public final java.lang.String getString(int, java.lang.Object...);		method public final java.lang.String getString(int, java.lang.Object...);
	method public abstract java.lang.Object getSystemService(java.lang.String);		method public abstract java.lang.Object getSystemService(java.lang.String);
	@@ -29596,6 +29594,7 @@ package android.os.storage {
	method public java.lang.String getMountedObbPath(java.lang.String);		method public java.lang.String getMountedObbPath(java.lang.String);
	method public android.os.storage.StorageVolume getPrimaryVolume();		method public android.os.storage.StorageVolume getPrimaryVolume();
	method public android.os.storage.StorageVolume[] getVolumeList();		method public android.os.storage.StorageVolume[] getVolumeList();
			method public boolean isEncrypted(java.io.File);
	method public boolean isObbMounted(java.lang.String);		method public boolean isObbMounted(java.lang.String);
	method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);		method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
	method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);

api/removed.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,8 @@ package android.content {
	public abstract class Context {		public abstract class Context {
	method public deprecated android.content.Context createCredentialEncryptedStorageContext();		method public deprecated android.content.Context createCredentialEncryptedStorageContext();
	method public deprecated android.content.Context createDeviceEncryptedStorageContext();		method public deprecated android.content.Context createDeviceEncryptedStorageContext();
			method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
			method public abstract java.io.File getSharedPreferencesPath(java.lang.String);
	method public deprecated boolean isCredentialEncryptedStorage();		method public deprecated boolean isCredentialEncryptedStorage();
	method public deprecated boolean isDeviceEncryptedStorage();		method public deprecated boolean isDeviceEncryptedStorage();
	method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);		method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);

api/system-current.txt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8316,8 +8316,6 @@ package android.content {
	method public abstract java.lang.String getPackageResourcePath();		method public abstract java.lang.String getPackageResourcePath();
	method public abstract android.content.res.Resources getResources();		method public abstract android.content.res.Resources getResources();
	method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);		method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
	method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
	method public abstract java.io.File getSharedPreferencesPath(java.lang.String);
	method public final java.lang.String getString(int);		method public final java.lang.String getString(int);
	method public final java.lang.String getString(int, java.lang.Object...);		method public final java.lang.String getString(int, java.lang.Object...);
	method public abstract java.lang.Object getSystemService(java.lang.String);		method public abstract java.lang.Object getSystemService(java.lang.String);
	@@ -31909,6 +31907,7 @@ package android.os.storage {
	method public java.lang.String getMountedObbPath(java.lang.String);		method public java.lang.String getMountedObbPath(java.lang.String);
	method public android.os.storage.StorageVolume getPrimaryVolume();		method public android.os.storage.StorageVolume getPrimaryVolume();
	method public android.os.storage.StorageVolume[] getVolumeList();		method public android.os.storage.StorageVolume[] getVolumeList();
			method public boolean isEncrypted(java.io.File);
	method public boolean isObbMounted(java.lang.String);		method public boolean isObbMounted(java.lang.String);
	method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);		method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
	method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);

api/system-removed.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@ package android.content {
	public abstract class Context {		public abstract class Context {
	method public deprecated android.content.Context createCredentialEncryptedStorageContext();		method public deprecated android.content.Context createCredentialEncryptedStorageContext();
	method public deprecated android.content.Context createDeviceEncryptedStorageContext();		method public deprecated android.content.Context createDeviceEncryptedStorageContext();
			method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
			method public abstract java.io.File getSharedPreferencesPath(java.lang.String);
	method public deprecated boolean isCredentialEncryptedStorage();		method public deprecated boolean isCredentialEncryptedStorage();
	method public deprecated boolean isDeviceEncryptedStorage();		method public deprecated boolean isDeviceEncryptedStorage();
	method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);		method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);

api/test-current.txt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8022,8 +8022,6 @@ package android.content {
	method public abstract java.lang.String getPackageResourcePath();		method public abstract java.lang.String getPackageResourcePath();
	method public abstract android.content.res.Resources getResources();		method public abstract android.content.res.Resources getResources();
	method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);		method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
	method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
	method public abstract java.io.File getSharedPreferencesPath(java.lang.String);
	method public final java.lang.String getString(int);		method public final java.lang.String getString(int);
	method public final java.lang.String getString(int, java.lang.Object...);		method public final java.lang.String getString(int, java.lang.Object...);
	method public abstract java.lang.Object getSystemService(java.lang.String);		method public abstract java.lang.Object getSystemService(java.lang.String);
	@@ -29662,6 +29660,7 @@ package android.os.storage {
	method public java.lang.String getMountedObbPath(java.lang.String);		method public java.lang.String getMountedObbPath(java.lang.String);
	method public android.os.storage.StorageVolume getPrimaryVolume();		method public android.os.storage.StorageVolume getPrimaryVolume();
	method public android.os.storage.StorageVolume[] getVolumeList();		method public android.os.storage.StorageVolume[] getVolumeList();
			method public boolean isEncrypted(java.io.File);
	method public boolean isObbMounted(java.lang.String);		method public boolean isObbMounted(java.lang.String);
	method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);		method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
	method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);