| Catherine Shi | 0c1b921 | 2020-07-08 17:05:24 -0700 | [diff] [blame^] | 1 | diff --git a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java |
| 2 | index fc43882..832dc91 100644 |
| 3 | --- a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java |
| 4 | +++ b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java |
| 5 | @@ -67,6 +67,7 @@ import java.util.Arrays; |
| 6 | import java.util.HashSet; |
| 7 | import java.util.List; |
| 8 | import java.util.Set; |
| 9 | +import java.util.NoSuchElementException; |
| 10 | |
| 11 | /** |
| 12 | * This class represents an accessibility client - either an AccessibilityService or a UiAutomation. |
| 13 | @@ -978,7 +979,11 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ |
| 14 | /* ignore */ |
| 15 | } |
| 16 | if (mService != null) { |
| 17 | - mService.unlinkToDeath(this, 0); |
| 18 | + try { |
| 19 | + mService.unlinkToDeath(this, 0); |
| 20 | + }catch(NoSuchElementException e) { |
| 21 | + Slog.e(LOG_TAG, "Failed unregistering death link"); |
| 22 | + } |
| 23 | mService = null; |
| 24 | } |
| 25 | |