| commit | 4811f1daee9793f697a8e0dd6e805093b6ee8018 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue May 16 02:08:13 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 16 02:08:13 2023 +0000 |
| tree | e34b900c5e98d202c237955ef154a36231252cf7 | |
| parent | bcf8d4122b760fb18e9c0090c31ab0b429c4c374 [diff] | |
| parent | 081e525ff6f0d9d252954b8e926550f25e230409 [diff] |
Merge "Ignore the reboot to normal intent when DSU is locked"
diff --git a/core/java/android/app/assist/OWNERS b/core/java/android/app/assist/OWNERS index 80ecaa4..e4ffd7f 100644 --- a/core/java/android/app/assist/OWNERS +++ b/core/java/android/app/assist/OWNERS
@@ -1,7 +1,2 @@ -augale@google.com -joannechung@google.com -markpun@google.com -lpeter@google.com -tymtsai@google.com hackz@google.com volnov@google.com \ No newline at end of file
diff --git a/core/java/android/view/contentcapture/OWNERS b/core/java/android/view/contentcapture/OWNERS index d1eda96..43be4f6 100644 --- a/core/java/android/view/contentcapture/OWNERS +++ b/core/java/android/view/contentcapture/OWNERS
@@ -1,9 +1,4 @@ # Bug component: 544200 -augale@google.com -joannechung@google.com -markpun@google.com -lpeter@google.com -tymtsai@google.com hackz@google.com volnov@google.com \ No newline at end of file
diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index e1ae8d9..c161d8d4 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
@@ -1787,7 +1787,7 @@ try { mCb.unlinkToDeath(this, 0); } catch (NoSuchElementException e) { - Log.w(TAG, "CommunicationRouteClient could not not unregistered to binder"); + Log.w(TAG, "CommunicationRouteClient could not unlink to " + mCb + " binder death"); } }