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

Browse Source
This commit is contained in:
Erik Wolsheimer
2021-07-16 21:20:45 +00:00
committed by Android (Google) Code Review
parent 72a09019a0 f4148eafe5
commit defab5707c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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() {
mClientId.unlinkToDeath(this, 0); try {
mClientId.unlinkToDeath(this, 0);
} catch (NoSuchElementException e) {
// Either not linked, or already unlinked. Either way, nothing to do.
}
} }
@Override @Override