Merge "Iteration on contributed media APIs." (b867b4c4) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -4575,11 +4575,6 @@ package android.provider {
		field public static final int FLAG_REMOVABLE_USB = 524288; // 0x80000
		}

		public final class MediaStore {
		method public static void deleteContributedMedia(android.content.Context, java.lang.String);
		method public static long getContributedMediaSize(android.content.Context, java.lang.String);
		}

		public abstract class SearchIndexableData {
		ctor public SearchIndexableData();
		ctor public SearchIndexableData(android.content.Context);

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -1006,8 +1006,8 @@ package android.provider {
		}

		public final class MediaStore {
		method public static void deleteContributedMedia(android.content.Context, java.lang.String);
		method public static long getContributedMediaSize(android.content.Context, java.lang.String);
		method public static void deleteContributedMedia(android.content.Context, java.lang.String, android.os.UserHandle) throws java.io.IOException;
		method public static long getContributedMediaSize(android.content.Context, java.lang.String, android.os.UserHandle) throws java.io.IOException;
		}

		public final class Settings {

core/java/android/content/pm/PackageManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -1398,6 +1398,16 @@ public abstract class PackageManager {
		*/
		public static final int DELETE_DONT_KILL_APP = 0x00000008;

		/**
		* Flag parameter for {@link #deletePackage} to indicate that any
		* contributed media should also be deleted during this uninstall. The
		* meaning of "contributed" means it won't automatically be deleted when the
		* app is uninstalled.
		*
		* @hide
		*/
		public static final int DELETE_CONTRIBUTED_MEDIA = 0x00000010;

		/**
		* Flag parameter for {@link #deletePackage} to indicate that package deletion
		* should be chatty.

core/java/android/provider/MediaStore.java

+32 −20

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		import android.app.Activity;
		@@ -50,6 +49,7 @@ import android.os.OperationCanceledException;
		import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.storage.StorageManager;
		import android.os.storage.StorageVolume;
		import android.os.storage.VolumeInfo;
		@@ -2907,18 +2907,24 @@ public final class MediaStore {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA)
		public static @BytesLong long getContributedMediaSize(Context context, String packageName) {
		try (ContentProviderClient client = context.getContentResolver()
		.acquireContentProviderClient(AUTHORITY)) {
		public static @BytesLong long getContributedMediaSize(Context context, String packageName,
		UserHandle user) throws IOException {
		final UserManager um = context.getSystemService(UserManager.class);
		if (um.isUserUnlocked(user) && um.isUserRunning(user)) {
		try {
		final ContentResolver resolver = context
		.createPackageContextAsUser(packageName, 0, user).getContentResolver();
		final Bundle in = new Bundle();
		in.putString(Intent.EXTRA_PACKAGE_NAME, packageName);
		final Bundle out = client.call(GET_CONTRIBUTED_MEDIA_CALL, null, in);
		final Bundle out = resolver.call(AUTHORITY, GET_CONTRIBUTED_MEDIA_CALL, null, in);
		return out.getLong(Intent.EXTRA_INDEX);
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		} catch (Exception e) {
		throw new IOException(e);
		}
		} else {
		throw new IOException("User " + user + " must be unlocked and running");
		}
		}

		@@ -2929,17 +2935,23 @@ public final class MediaStore {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA)
		public static void deleteContributedMedia(Context context, String packageName) {
		try (ContentProviderClient client = context.getContentResolver()
		.acquireContentProviderClient(AUTHORITY)) {
		public static void deleteContributedMedia(Context context, String packageName,
		UserHandle user) throws IOException {
		final UserManager um = context.getSystemService(UserManager.class);
		if (um.isUserUnlocked(user) && um.isUserRunning(user)) {
		try {
		final ContentResolver resolver = context
		.createPackageContextAsUser(packageName, 0, user).getContentResolver();
		final Bundle in = new Bundle();
		in.putString(Intent.EXTRA_PACKAGE_NAME, packageName);
		client.call(DELETE_CONTRIBUTED_MEDIA_CALL, null, in);
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		resolver.call(AUTHORITY, DELETE_CONTRIBUTED_MEDIA_CALL, null, in);
		} catch (Exception e) {
		throw new IOException(e);
		}
		} else {
		throw new IOException("User " + user + " must be unlocked and running");
		}
		}
		}

services/core/java/com/android/server/pm/PackageManagerService.java

+13 −4

Original line number	Diff line number	Diff line
		@@ -237,6 +237,7 @@ import android.os.storage.StorageManager;
		import android.os.storage.StorageManagerInternal;
		import android.os.storage.VolumeInfo;
		import android.os.storage.VolumeRecord;
		import android.provider.MediaStore;
		import android.provider.Settings.Global;
		import android.provider.Settings.Secure;
		import android.security.KeyStore;
		@@ -17924,7 +17925,7 @@ public class PackageManagerService extends IPackageManager.Stub
		final int removedUserId = (user != null) ? user.getIdentifier()
		: UserHandle.USER_ALL;

		clearPackageStateForUserLIF(ps, removedUserId, outInfo);
		clearPackageStateForUserLIF(ps, removedUserId, outInfo, flags);
		markPackageUninstalledForUserLPw(ps, user);
		scheduleWritePackageRestrictionsLocked(user);
		return;
		@@ -17954,7 +17955,7 @@ public class PackageManagerService extends IPackageManager.Stub
		// we need to do is clear this user's data and save that
		// it is uninstalled.
		if (DEBUG_REMOVE) Slog.d(TAG, "Still installed by other users");
		clearPackageStateForUserLIF(ps, user.getIdentifier(), outInfo);
		clearPackageStateForUserLIF(ps, user.getIdentifier(), outInfo, flags);
		scheduleWritePackageRestrictionsLocked(user);
		return;
		} else {
		@@ -17970,7 +17971,7 @@ public class PackageManagerService extends IPackageManager.Stub
		// we need to do is clear this user's data and save that
		// it is uninstalled.
		if (DEBUG_REMOVE) Slog.d(TAG, "Deleting system app");
		clearPackageStateForUserLIF(ps, user.getIdentifier(), outInfo);
		clearPackageStateForUserLIF(ps, user.getIdentifier(), outInfo, flags);
		scheduleWritePackageRestrictionsLocked(user);
		return;
		}
		@@ -18087,7 +18088,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}

		private void clearPackageStateForUserLIF(PackageSetting ps, int userId,
		PackageRemovedInfo outInfo) {
		PackageRemovedInfo outInfo, int flags) {
		final PackageParser.Package pkg;
		synchronized (mPackages) {
		pkg = mPackages.get(ps.name);
		@@ -18112,6 +18113,14 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		resetUserChangesToRuntimePermissionsAndFlagsLPw(ps, nextUserId);
		}
		// Also delete contributed media, when requested
		if ((flags & PackageManager.DELETE_CONTRIBUTED_MEDIA) != 0) {
		try {
		MediaStore.deleteContributedMedia(mContext, ps.name, UserHandle.of(nextUserId));
		} catch (IOException e) {
		Slog.w(TAG, "Failed to delete contributed media for " + ps.name, e);
		}
		}
		}

		if (outInfo != null) {