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

Commit dd8b4ef4 authored by Agatha Man's avatar Agatha Man Committed by Automerger Merge Worker
Browse files

Merge "linkToDeath exception cause system server crash" into rvc-qpr-dev am: 4ec6ae5f 

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

Change-Id: I2c50adedd5dec7f0c509963ca2ac56c066090954
parents da4119d3 4ec6ae5f

diff

0 → 100644
+25 −0
Original line number Diff line number Diff line 
diff --git a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

index fc43882..832dc91 100644

--- a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

+++ b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

@@ -67,6 +67,7 @@ import java.util.Arrays;

 import java.util.HashSet;

 import java.util.List;

 import java.util.Set;

+import java.util.NoSuchElementException;

 

 /**

  * This class represents an accessibility client - either an AccessibilityService or a UiAutomation.

@@ -978,7 +979,11 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ

                 /* ignore */

         }

         if (mService != null) {

-            mService.unlinkToDeath(this, 0);

+            try {

+                mService.unlinkToDeath(this, 0);

+            }catch(NoSuchElementException e) {

+                Slog.e(LOG_TAG, "Failed unregistering death link");

+            }

             mService = null;

         }

services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

+6 −1
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ import java.util.Arrays; 
import java.util.Collections;

import java.util.HashSet;

import java.util.List;

import java.util.NoSuchElementException;

import java.util.Set;



/**
@@ -1179,7 +1180,11 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 
                /* ignore */

        }

        if (mService != null) {

            try {

                mService.unlinkToDeath(this, 0);

            } catch (NoSuchElementException e) {

                Slog.e(LOG_TAG, "Failed unregistering death link");

            }

            mService = null;

        }