Merge changes from topic "actuallyUsePermissionControllerToRestoreBackup" (7d717842) · Commits · e / os / android_frameworks_base

api/test-current.txt

+7 −0

core/java/android/content/pm/IPackageManager.aidl

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -295,8 +295,6 @@ interface IPackageManager {
	void restoreDefaultApps(in byte[] backup, int userId);		void restoreDefaultApps(in byte[] backup, int userId);
	byte[] getIntentFilterVerificationBackup(int userId);		byte[] getIntentFilterVerificationBackup(int userId);
	void restoreIntentFilterVerification(in byte[] backup, int userId);		void restoreIntentFilterVerification(in byte[] backup, int userId);
	byte[] getPermissionGrantBackup(int userId);
	void restorePermissionGrants(in byte[] backup, int userId);

	/**		/**
	* Report the set of 'Home' activity candidates, plus (if any) which of them		* Report the set of 'Home' activity candidates, plus (if any) which of them

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

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2943,6 +2943,7 @@ public abstract class PackageManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	public static final int FLAG_PERMISSION_USER_SET = 1 << 0;		public static final int FLAG_PERMISSION_USER_SET = 1 << 0;

	/**		/**
	@@ -2953,6 +2954,7 @@ public abstract class PackageManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	public static final int FLAG_PERMISSION_USER_FIXED = 1 << 1;		public static final int FLAG_PERMISSION_USER_FIXED = 1 << 1;

	/**		/**
	@@ -2976,6 +2978,7 @@ public abstract class PackageManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 1 << 3;		public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 1 << 3;

	/**		/**
	@@ -3005,6 +3008,7 @@ public abstract class PackageManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 1 << 6;		public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 1 << 6;

	/**		/**
	@@ -3014,6 +3018,7 @@ public abstract class PackageManager {
	*		*
	* @hide		* @hide
	*/		*/
			@TestApi
	public static final int FLAG_PERMISSION_REVOKE_WHEN_REQUESTED = 1 << 7;		public static final int FLAG_PERMISSION_REVOKE_WHEN_REQUESTED = 1 << 7;

	/**		/**
	@@ -3795,6 +3800,7 @@ public abstract class PackageManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	@RequiresPermission(anyOf = {		@RequiresPermission(anyOf = {
	android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS,		android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS,
	android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS		android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS
	@@ -3815,6 +3821,7 @@ public abstract class PackageManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@TestApi
	@RequiresPermission(anyOf = {		@RequiresPermission(anyOf = {
	android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS,		android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS,
	android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS		android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS

core/java/android/permission/PermissionControllerManager.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -624,7 +624,7 @@ public final class PermissionControllerManager {
	*		*
	* <p>Needs to be called when canceling this task as it might be hung.		* <p>Needs to be called when canceling this task as it might be hung.
	*/		*/
	void interruptRead() {		void interruptWrite() {
	IoUtils.closeQuietly(mLocalPipe);		IoUtils.closeQuietly(mLocalPipe);
	}		}

	@@ -806,18 +806,19 @@ public final class PermissionControllerManager {

	@Override		@Override
	public void run(@NonNull IPermissionController service) {		public void run(@NonNull IPermissionController service) {
			mBackupSender.execute(mBackup);

	ParcelFileDescriptor remotePipe = mBackupSender.getRemotePipe();		ParcelFileDescriptor remotePipe = mBackupSender.getRemotePipe();
	try {		try {
	service.restoreRuntimePermissionBackup(mUser, remotePipe);		service.restoreRuntimePermissionBackup(mUser, remotePipe);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error sending runtime permission backup", e);		Log.e(TAG, "Error sending runtime permission backup", e);
	mBackupSender.cancel(false);		mBackupSender.cancel(false);
			mBackupSender.interruptWrite();
	} finally {		} finally {
	// Remote pipe end is duped by binder call. Local copy is not needed anymore		// Remote pipe end is duped by binder call. Local copy is not needed anymore
	IoUtils.closeQuietly(remotePipe);		IoUtils.closeQuietly(remotePipe);
	}		}

	mBackupSender.execute(mBackup);
	}		}
	}		}

core/java/android/permission/PermissionManagerInternal.java

0 → 100644

+62 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2019 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package android.permission;

			import android.annotation.NonNull;
			import android.annotation.Nullable;
			import android.os.UserHandle;

			/**
			* Internal interfaces to be used by other components within the system server.
			*
			* <p>Only for use within the system server.
			*
			* @hide
			*/
			public abstract class PermissionManagerInternal {
			/**
			* Get the state of the runtime permissions as xml file.
			*
			* @param user The user the data should be extracted for
			*
			* @return The state as a xml file
			*/
			public abstract @Nullable byte[] backupRuntimePermissions(@NonNull UserHandle user);

			/**
			* Restore a permission state previously backed up via {@link #backupRuntimePermissions}.
			*
			* <p>If not all state can be restored, the un-restoreable state will be delayed and can be
			* re-tried via {@link #restoreDelayedRuntimePermissions}.
			*
			* @param backup The state as an xml file
			* @param user The user the data should be restored for
			*/
			public abstract void restoreRuntimePermissions(@NonNull byte[] backup,
			@NonNull UserHandle user);

			/**
			* Try to apply permission backup of a package that was previously not applied.
			*
			* @param packageName The package that is newly installed
			* @param user The user the package is installed for
			*
			* @see #restoreRuntimePermissions
			*/
			public abstract void restoreDelayedRuntimePermissions(@NonNull String packageName,
			@NonNull UserHandle user);
			}