Merge "API for accessing preloaded files cache" (96b98321) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -8992,6 +8992,7 @@ package android.content {
		method public abstract android.content.pm.PackageManager getPackageManager();
		method public abstract java.lang.String getPackageName();
		method public abstract java.lang.String getPackageResourcePath();
		method public abstract java.io.File getPreloadsFileCache();
		method public abstract android.content.res.Resources getResources();
		method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public final java.lang.String getString(int);
		@@ -9203,6 +9204,7 @@ package android.content {
		method public android.content.pm.PackageManager getPackageManager();
		method public java.lang.String getPackageName();
		method public java.lang.String getPackageResourcePath();
		method public java.io.File getPreloadsFileCache();
		method public android.content.res.Resources getResources();
		method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public java.lang.Object getSystemService(java.lang.String);
		@@ -43391,6 +43393,7 @@ package android.test.mock {
		method public android.content.pm.PackageManager getPackageManager();
		method public java.lang.String getPackageName();
		method public java.lang.String getPackageResourcePath();
		method public java.io.File getPreloadsFileCache();
		method public android.content.res.Resources getResources();
		method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public java.lang.Object getSystemService(java.lang.String);

core/java/android/app/ContextImpl.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -638,6 +638,15 @@ class ContextImpl extends Context {
		}
		}

		/**
		* @hide
		*/
		@Nullable
		@Override
		public File getPreloadsFileCache() {
		return Environment.getDataPreloadsFileCacheDirectory(getPackageName());
		}

		@Override
		public File getFileStreamPath(String name) {
		return makeFilename(getFilesDir(), name);

core/java/android/content/Context.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -1229,6 +1229,16 @@ public abstract class Context {
		@Nullable
		public abstract File getExternalCacheDir();

		/**
		* Returns absolute path to application-specific directory in the preloaded cache.
		* <p>Files stored in the cache directory can be deleted when the device runs low on storage.
		* There is no guarantee when these files will be deleted.
		* @hide
		*/
		@Nullable
		@SystemApi
		public abstract File getPreloadsFileCache();

		/**
		* Returns absolute paths to application-specific directories on all
		* shared/external storage devices where the application can place cache

core/java/android/content/ContextWrapper.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,13 @@ public class ContextWrapper extends Context {
		return mBase.getDir(name, mode);
		}


		/ @hide /
		@Override
		public File getPreloadsFileCache() {
		return mBase.getPreloadsFileCache();
		}

		@Override
		public SQLiteDatabase openOrCreateDatabase(String name, int mode, CursorFactory factory) {
		return mBase.openOrCreateDatabase(name, mode, factory);

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -765,6 +765,10 @@ public class MockContext extends Context {
		throw new UnsupportedOperationException();
		}

		/ @hide /
		@Override
		public File getPreloadsFileCache() { throw new UnsupportedOperationException(); }

		@Override
		public Context createDeviceProtectedStorageContext() {
		throw new UnsupportedOperationException();