Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Small fixes in PermissionControllerManager/Service"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-01 21:27:32 +00:00
committed by Android (Google) Code Review
parent 344090048a 9b12e37a4f
commit 7d62125f75
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/permission/PermissionControllerManager.java
View File

@@ -269,6 +269,7 @@ public final class PermissionControllerManager {
public void getRuntimePermissionBackup(@NonNull UserHandle user,
@NonNull @CallbackExecutor Executor executor,
@NonNull OnGetRuntimePermissionBackupCallback callback) {
checkNotNull(user);
checkNotNull(executor);
checkNotNull(callback);

14
core/java/android/permission/PermissionControllerService.java
View File

@@ -56,7 +56,7 @@ import java.util.Map;
/**
* This service is meant to be implemented by the app controlling permissions.
*
* @see PermissionController
* @see PermissionControllerManager
*
* @hide
*/
@@ -98,10 +98,10 @@ public abstract class PermissionControllerService extends Service {
* Create a backup of the runtime permissions.
*
* @param user The user to back up
* @param out The stream to write the backup to
* @param backup The stream to write the backup to
*/
public abstract void onGetRuntimePermissionsBackup(@NonNull UserHandle user,
@NonNull OutputStream out);
@NonNull OutputStream backup);
/**
* Gets the runtime permissions for an app.
@@ -297,11 +297,11 @@ public abstract class PermissionControllerService extends Service {
}
private void getRuntimePermissionsBackup(@NonNull UserHandle user,
@NonNull ParcelFileDescriptor outFile) {
try (OutputStream out = new ParcelFileDescriptor.AutoCloseOutputStream(outFile)) {
onGetRuntimePermissionsBackup(user, out);
@NonNull ParcelFileDescriptor backupFile) {
try (OutputStream backup = new ParcelFileDescriptor.AutoCloseOutputStream(backupFile)) {
onGetRuntimePermissionsBackup(user, backup);
} catch (IOException e) {
Log.e(LOG_TAG, "Could not open pipe to write backup tp", e);
Log.e(LOG_TAG, "Could not open pipe to write backup to", e);
}
}