| commit | 4a89fb33f4f0b0ed03e213a5a653b2bc2203b65a | [log] [tgz] |
|---|---|---|
| author | George Chang <georgekgchang@google.com> | Thu Feb 02 06:42:03 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Feb 02 06:42:03 2023 +0000 |
| tree | ae5fbee326103b37d8823642355681e21622b127 | |
| parent | d20bc58ae9f327dda75f0457ef73eba23f99d7a1 [diff] | |
| parent | 2d2314a038d235d0b5a7aeca7d3c79d1183f6029 [diff] |
Merge "Add more details in the javadocs for getTagIntentAppPreferenceForUser"
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/OWNERS b/packages/SettingsLib/src/com/android/settingslib/media/OWNERS index d40f322..3cae39f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/OWNERS +++ b/packages/SettingsLib/src/com/android/settingslib/media/OWNERS
@@ -1,2 +1,5 @@ # Default reviewers for this and subdirectories. shaoweishen@google.com + +#Android Media - For minor changes and renames only. +aquilescanta@google.com #{LAST_RESORT_SUGGESTION}
diff --git a/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java b/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java index dce1c96..39c649b 100644 --- a/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java +++ b/services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java
@@ -111,7 +111,7 @@ bb.order(ByteOrder.LITTLE_ENDIAN); final int msgLen = bb.getInt(); - if (msgLen <= 0 || msgLen > MAX_CLIPBOARD_BYTES) { + if (msgLen < 0 || msgLen > MAX_CLIPBOARD_BYTES) { throw new ProtocolException("Clipboard message length: " + msgLen + " out of bounds."); }