Prevent fatal exception at AppOpsService$InProgressStartOpEvent#finish

Bug: 193757138
Test: Manual
Change-Id: I6187e6c1e12fbda0d646a288a7e7fad20832a568
This commit is contained in:
Erik Wolsheimer
2021-07-15 21:00:43 -07:00
parent 4162c032bf
commit f4148eafe5

View File

@@ -202,6 +202,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Scanner;
import java.util.Set;
@@ -775,7 +776,11 @@ public class AppOpsService extends IAppOpsService.Stub {
/** Clean up event */
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