summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-04-24 12:12:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-04-24 12:12:53 +0000
commitad8159bea0693a756e5b8f8e9aa2e17fdfecd1ce (patch)
treec389570d425d357084b637cbe285ab99afa7e305
parent0bbd1f573f4c93103f9e6e1c75c7d880b6576402 (diff)
parent2bf65c6e5c8068ec498aa1940a2ea77b11db6b6e (diff)
Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev
-rw-r--r--core/java/android/app/backup/BackupManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/backup/BackupManager.java b/core/java/android/app/backup/BackupManager.java
index debc32bd83eb..30f340c50e32 100644
--- a/core/java/android/app/backup/BackupManager.java
+++ b/core/java/android/app/backup/BackupManager.java
@@ -387,7 +387,7 @@ public class BackupManager {
@SystemApi
@RequiresPermission(android.Manifest.permission.BACKUP)
public boolean isBackupServiceActive(UserHandle user) {
- mContext.enforceCallingPermission(android.Manifest.permission.BACKUP,
+ mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP,
"isBackupServiceActive");
checkServiceBinder();
if (sService != null) {