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

Commit 4ec6ae5f authored by Agatha Man's avatar Agatha Man Committed by Android (Google) Code Review
Browse files

Merge "linkToDeath exception cause system server crash" into rvc-qpr-dev

parents f3f9ce31 0c1b9219

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;

        }