Merge "Protect unbindBackupAgent() with CONFIRM_FULL_BACKUP permission"

2018-06-15 08:43:50 +00:00
parent ad15fe339b 775fd4309f
commit 90950d7e4e
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -17977,6 +17977,7 @@ public class ActivityManagerService extends IActivityManager.Stub
    // done with this agent
    public void unbindBackupAgent(ApplicationInfo appInfo) {
        if (DEBUG_BACKUP) Slog.v(TAG_BACKUP, "unbindBackupAgent: " + appInfo);
+        enforceCallingPermission("android.permission.CONFIRM_FULL_BACKUP", "unbindBackupAgent");
        if (appInfo == null) {
            Slog.w(TAG, "unbind backup agent for null app");
            return;