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

[DO NOT MERGE] Guard against launching permission backup/restore twice per request

Browse Source 
It looks like there is some case where AbstractRemoteService would #run the
same PendingRequest the second time which violates AsyncTask assumption.

Fixes: 135986503
Test: atest android.permission.cts.PermissionControllerTest
Change-Id: I2d072714ee0fad3c365ff7eb191d690056c0931a
This commit is contained in:
Eugene Susla
2019-06-26 15:47:44 -07:00
parent f4535c8d51
commit 8c2fb0ea1e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -808,6 +808,9 @@ public final class PermissionControllerManager {
@Override @Override
public void run() { public void run() {
if (mBackupReader.getStatus() != AsyncTask.Status.PENDING) {
return;
}
mBackupReader.execute(); mBackupReader.execute();
ParcelFileDescriptor remotePipe = mBackupReader.getRemotePipe(); ParcelFileDescriptor remotePipe = mBackupReader.getRemotePipe();
@@ -919,6 +922,9 @@ public final class PermissionControllerManager {
@Override @Override
public void run(@NonNull IPermissionController service) { public void run(@NonNull IPermissionController service) {
if (mBackupSender.getStatus() != AsyncTask.Status.PENDING) {
return;
}
mBackupSender.execute(mBackup); mBackupSender.execute(mBackup);
ParcelFileDescriptor remotePipe = mBackupSender.getRemotePipe(); ParcelFileDescriptor remotePipe = mBackupSender.getRemotePipe();