summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Agatha Man <agathaman@google.com> 2020-10-27 20:15:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-10-27 20:15:41 +0000
commit1ca2a4b1bb5ab2f2be9e0d4e43fc23e6eaee0498 (patch)
tree86afa7d99237b1106989761055decd0bdf7849c2
parent4d94bc86f8a344a469c39c4ff0e8efba9ee2f62a (diff)
parent9eb06f996568eb87b888aa03b6b84f9e767645f7 (diff)
Merge "Remove accidentally added diff file" into rvc-qpr-dev
-rw-r--r--diff25
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;
- }
-