diff options
| author | Agatha Man <agathaman@google.com> | 2020-10-12 12:45:41 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-12-09 17:49:54 -0800 |
| commit | 3cfbcbee1679369eca04b016bd959339a5e86057 (patch) | |
| tree | b67f109a8dec291343933151d595fb49b48a83c7 | |
| parent | c6218f797781e3adbd330664f3974886dcda447d (diff) | |
| download | base-3cfbcbee1679369eca04b016bd959339a5e86057.tar.gz | |
Remove accidentally added diff filetemp_rvc_qpr_merge
Bug: 169889379
Test: presubmit
Change-Id: Ib81ba3288a986546bc570c3759c55d026add591a
| -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; - } - |