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

Merge "Prevent fatal exception at AppOpsService$InProgressStartOpEvent#finish" into sc-dev am: defab5707c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302655

Change-Id: I837e751493b92cf214b66f80214a513c39f4372d
This commit is contained in:
Erik Wolsheimer
2021-07-16 21:57:56 +00:00
committed by Automerger Merge Worker
parent 8eb4a90dfb defab5707c
commit 1aed08c2b8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -202,6 +202,7 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects; import java.util.Objects;
import java.util.Scanner; import java.util.Scanner;
import java.util.Set; import java.util.Set;
@@ -775,7 +776,11 @@ public class AppOpsService extends IAppOpsService.Stub {
/** Clean up event */ /** Clean up event */
public void finish() { public void finish() {
try {
mClientId.unlinkToDeath(this, 0); mClientId.unlinkToDeath(this, 0);
} catch (NoSuchElementException e) {
// Either not linked, or already unlinked. Either way, nothing to do.
}
} }
@Override @Override