commit 40c586444590e06735726af84b02a216740e4b05
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 29 02:56:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 29 02:56:35 2019 +0000
tree 02d1f2133503c95c830b54f4af75f6e9dc8e0784
parent bf4eee2181ea0d456a1bd6a359eab498edafabae
parent 8c2fb0ea1ecc76cbb631a5664feb46e2a895846e

Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev

core/java/android/permission/PermissionControllerManager.java

diff --git a/core/java/android/permission/PermissionControllerManager.java b/core/java/android/permission/PermissionControllerManager.java
index 3ab5c51..5b2e3a2 100644
--- a/core/java/android/permission/PermissionControllerManager.java
+++ b/core/java/android/permission/PermissionControllerManager.java
@@ -808,6 +808,9 @@
 
         @Override
         public void run() {
+            if (mBackupReader.getStatus() != AsyncTask.Status.PENDING) {
+                return;
+            }
             mBackupReader.execute();
 
             ParcelFileDescriptor remotePipe = mBackupReader.getRemotePipe();
@@ -919,6 +922,9 @@
 
         @Override
         public void run(@NonNull IPermissionController service) {
+            if (mBackupSender.getStatus() != AsyncTask.Status.PENDING) {
+                return;
+            }
             mBackupSender.execute(mBackup);
 
             ParcelFileDescriptor remotePipe = mBackupSender.getRemotePipe();