Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74827132 authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by Automerger Merge Worker
Browse files

Merge "Prevent fatal exception at AppOpsService$InProgressStartOpEvent#finish"... 

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

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

Change-Id: I37765c18d92686cf8aa056c95cebdbd40701518e
parents bee70d9b 1aed08c2

services/core/java/com/android/server/appop/AppOpsService.java

+6 −1
Original line number Diff line number Diff line
@@ -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() {

            try {

                mClientId.unlinkToDeath(this, 0);

            } catch (NoSuchElementException e) {

                // Either not linked, or already unlinked. Either way, nothing to do.

            }

        }



        @Override