diff options
| -rw-r--r-- | services/core/java/com/android/server/appop/AppOpsService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 5f212738a41b..24edc01c24df 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -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 |