diff options
| author | 2020-10-27 20:43:38 +0000 | |
|---|---|---|
| committer | 2020-10-27 20:43:38 +0000 | |
| commit | db8249fd409a6525d162bfc307558d6672938dac (patch) | |
| tree | d9952e4b345db5cac8eaae2a094979e4a4808e9e | |
| parent | e573aca07b35722ab924da55c0b81f8d974281c0 (diff) | |
| parent | 1ca2a4b1bb5ab2f2be9e0d4e43fc23e6eaee0498 (diff) | |
Merge "Remove accidentally added diff file" into rvc-qpr-dev am: 1ca2a4b1bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12817174
Change-Id: I375480141afff06a4cfd51508857fa754e839097
| -rw-r--r-- | diff | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/diff b/diff deleted file mode 100644 index 5c75d88e6789..000000000000 --- a/diff +++ /dev/null @@ -1,25 +0,0 @@ -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; - } - |