diff options
| -rw-r--r-- | ApiDocs.bp | 41 | ||||
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 14 | ||||
| -rw-r--r-- | core/java/android/service/voice/OWNERS | 4 | ||||
| -rw-r--r-- | core/proto/android/os/system_properties.proto | 5 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/media/OWNERS | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/clipboard/EmulatorClipboardMonitor.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/data/DataProfile.java | 2 |
7 files changed, 46 insertions, 25 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index a46ecce5c721..90b6603b8787 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -422,26 +422,27 @@ java_genrule { "$(location merge_zips) $(out) $(location :ds-docs-java{.docs.zip}) $(genDir)/ds-docs-kt-moved.zip", } -java_genrule { - name: "ds-docs-switched", - tools: [ - "switcher4", - "soong_zip", - ], - srcs: [ - ":ds-docs-java{.docs.zip}", - ":ds-docs-kt{.docs.zip}", - ], - out: ["ds-docs-switched.zip"], - dist: { - targets: ["docs"], - }, - cmd: "unzip -q $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " + - "unzip -q $(location :ds-docs-kt{.docs.zip}) -d $(genDir)/en/reference/kotlin && " + - "SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " + - "(cd $(genDir)/en/reference && $$SWITCHER --work platform) > /dev/null && " + - "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", -} +// Disable doc generation until Doclava is migrated to JDK 17 (b/240421555). +// java_genrule { +// name: "ds-docs-switched", +// tools: [ +// "switcher4", +// "soong_zip", +// ], +// srcs: [ +// ":ds-docs-java{.docs.zip}", +// ":ds-docs-kt{.docs.zip}", +// ], +// out: ["ds-docs-switched.zip"], +// dist: { +// targets: ["docs"], +// }, +// cmd: "unzip -q $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " + +// "unzip -q $(location :ds-docs-kt{.docs.zip}) -d $(genDir)/en/reference/kotlin && " + +// "SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " + +// "(cd $(genDir)/en/reference && $$SWITCHER --work platform) > /dev/null && " + +// "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", +// } droiddoc { name: "ds-static-docs", diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index a980158a2e5e..7378ac7638de 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -2510,8 +2510,18 @@ public final class NfcAdapter { * * <p>This returns a mapping of package names for this user id to whether we dispatch Tag * intents to the package. {@link #ACTION_NDEF_DISCOVERED}, {@link #ACTION_TECH_DISCOVERED} or - * {@link #ACTION_TAG_DISCOVERED} will not be dispatched to an Activity if its package is - * disallowed. + * {@link #ACTION_TAG_DISCOVERED} will not be dispatched to an Activity if its package is + * mapped to {@code false}. + * <p>There are three different possible cases: + * <p>A package not being in the preference list. + * It does not contain any Tag intent filters or the user never triggers a Tag detection that + * matches the intent filter of the package. + * <p>A package being mapped to {@code true}. + * When a package has been launched by a tag detection for the first time, the package name is + * put to the map and by default mapped to {@code true}. The package will receive Tag intents as + * usual. + * <p>A package being mapped to {@code false}. + * The user chooses to disable this package and it will not receive any Tag intents anymore. * * @param userId the user to whom this preference list will belong to * @return a map of the UserId which indicates the mapping from package name to diff --git a/core/java/android/service/voice/OWNERS b/core/java/android/service/voice/OWNERS index 59a0c2e36612..ec4410086edf 100644 --- a/core/java/android/service/voice/OWNERS +++ b/core/java/android/service/voice/OWNERS @@ -1,3 +1,7 @@ # Bug component: 533220 include /core/java/android/app/assist/OWNERS + +# The owner here should not be assist owner +liangyuchen@google.com +tuanng@google.com diff --git a/core/proto/android/os/system_properties.proto b/core/proto/android/os/system_properties.proto index 4f3eeb0733f4..84c82e094dd4 100644 --- a/core/proto/android/os/system_properties.proto +++ b/core/proto/android/os/system_properties.proto @@ -514,7 +514,10 @@ message SystemPropertiesProto { optional string gfx_driver_whitelist_0 = 45; - // Next Tag: 46 + optional bool egl_blobcache_multifile = 46; + optional int32 egl_blobcache_multifile_limit = 47; + + // Next Tag: 48 } optional Ro ro = 21; diff --git a/packages/SettingsLib/src/com/android/settingslib/media/OWNERS b/packages/SettingsLib/src/com/android/settingslib/media/OWNERS index d40f322042fe..3cae39f4ea40 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 dce1c9684987..39c649bd05c0 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 @@ class EmulatorClipboardMonitor implements Consumer<ClipData> { 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."); } diff --git a/telephony/java/android/telephony/data/DataProfile.java b/telephony/java/android/telephony/data/DataProfile.java index 5e111639b100..f346b9208bcd 100644 --- a/telephony/java/android/telephony/data/DataProfile.java +++ b/telephony/java/android/telephony/data/DataProfile.java @@ -147,7 +147,7 @@ public final class DataProfile implements Parcelable { if (mApnSetting != null) { return mApnSetting.getProtocol(); } - return ApnSetting.PROTOCOL_IP; + return ApnSetting.PROTOCOL_IPV4V6; } /** |