Merge "Expose @SystemApi and @Public for unbundling DocumentsUI" (708249b9) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

api/system-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1044,6 +1044,10 @@ package android.content {
	method public void setDetectNotResponding(long);		method public void setDetectNotResponding(long);
	}		}

			public abstract class ContentResolver {
			method public android.graphics.drawable.Drawable getTypeDrawable(java.lang.String);
			}

	public abstract class Context {		public abstract class Context {
	method public boolean bindServiceAsUser(android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle);		method public boolean bindServiceAsUser(android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle);
	method public abstract android.content.Context createCredentialProtectedStorageContext();		method public abstract android.content.Context createCredentialProtectedStorageContext();

core/java/android/content/ContentResolver.java

+22 −3

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.annotation.IntDef;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.RequiresPermission;		import android.annotation.RequiresPermission;
			import android.annotation.SystemApi;
	import android.annotation.TestApi;		import android.annotation.TestApi;
	import android.annotation.UnsupportedAppUsage;		import android.annotation.UnsupportedAppUsage;
	import android.annotation.UserIdInt;		import android.annotation.UserIdInt;
	@@ -2978,7 +2979,12 @@ public abstract class ContentResolver implements ContentInterface {
	}		}
	}		}

	/** {@hide} */		/**
			* Put the cache with the key.
			*
			* @param key the key to add
			* @param value the value to add
			*/
	public void putCache(Uri key, Bundle value) {		public void putCache(Uri key, Bundle value) {
	try {		try {
	getContentService().putCache(mContext.getPackageName(), key, value,		getContentService().putCache(mContext.getPackageName(), key, value,
	@@ -2988,7 +2994,13 @@ public abstract class ContentResolver implements ContentInterface {
	}		}
	}		}

	/** {@hide} */		/**
			* Get the cache with the key.
			*
			* @param key the key to get the value
			* @return the matched value. If the key doesn't exist, will return null.
			* @see #putCache(Uri, Bundle)
			*/
	public Bundle getCache(Uri key) {		public Bundle getCache(Uri key) {
	try {		try {
	final Bundle bundle = getContentService().getCache(mContext.getPackageName(), key,		final Bundle bundle = getContentService().getCache(mContext.getPackageName(), key,
	@@ -3176,7 +3188,14 @@ public abstract class ContentResolver implements ContentInterface {
	return mContext.getUserId();		return mContext.getUserId();
	}		}

	/** @hide */		/**
			* Get the system drawable of the mime type.
			*
			* @param mimeType the requested mime type
			* @return the matched drawable
			* @hide
			*/
			@SystemApi
	public Drawable getTypeDrawable(String mimeType) {		public Drawable getTypeDrawable(String mimeType) {
	return MimeIconUtils.loadMimeIcon(mContext, mimeType);		return MimeIconUtils.loadMimeIcon(mContext, mimeType);
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -9402,6 +9402,7 @@ package android.content {
	method public static void cancelSync(android.content.SyncRequest);		method public static void cancelSync(android.content.SyncRequest);
	method public final android.net.Uri canonicalize(android.net.Uri);		method public final android.net.Uri canonicalize(android.net.Uri);
	method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);		method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
			method public android.os.Bundle getCache(android.net.Uri);
	method public static deprecated android.content.SyncInfo getCurrentSync();		method public static deprecated android.content.SyncInfo getCurrentSync();
	method public static java.util.List<android.content.SyncInfo> getCurrentSyncs();		method public static java.util.List<android.content.SyncInfo> getCurrentSyncs();
	method public static int getIsSyncable(android.accounts.Account, java.lang.String);		method public static int getIsSyncable(android.accounts.Account, java.lang.String);
	@@ -9432,6 +9433,7 @@ package android.content {
	method public final android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;		method public final android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;
	method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;		method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;
	method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;		method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;
			method public void putCache(android.net.Uri, android.os.Bundle);
	method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);		method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
	method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);		method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);
	method public final android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);		method public final android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);