diff options
37 files changed, 329 insertions, 230 deletions
diff --git a/Android.bp b/Android.bp index f5c0b6d416b8..f7f6beb7f150 100644 --- a/Android.bp +++ b/Android.bp @@ -163,6 +163,9 @@ java_library { "//external/robolectric:__subpackages__", "//frameworks/layoutlib:__subpackages__", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } // AIDL files under these paths are mixture of public and private ones. @@ -257,6 +260,9 @@ java_library { ], sdk_version: "core_platform", installable: false, + lint: { + baseline_filename: "lint-baseline.xml", + }, } // NOTE: This filegroup is exposed for vendor libraries to depend on and is referenced in @@ -423,6 +429,9 @@ java_library { ], sdk_version: "core_platform", installable: false, + lint: { + baseline_filename: "lint-baseline.xml", + }, } // Separated so framework-minus-apex-defaults can be used without the libs dependency @@ -466,6 +475,9 @@ java_library { ], compile_dex: false, headers_only: true, + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library { @@ -493,6 +505,9 @@ java_library { "-Xep:AndroidFrameworkUid:ERROR", ], }, + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library { @@ -507,6 +522,7 @@ java_library { }, lint: { enabled: false, + baseline_filename: "lint-baseline.xml", }, } @@ -531,6 +547,9 @@ java_library { ], sdk_version: "core_platform", apex_available: ["//apex_available:platform"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library { @@ -545,6 +564,9 @@ java_library { "calendar-provider-compat-config", "contacts-provider-platform-compat-config", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } platform_compat_config { @@ -592,6 +614,9 @@ java_library { "rappor", ], dxflags: ["--core-library"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } // utility classes statically linked into framework-wifi and dynamically linked @@ -617,6 +642,9 @@ java_library { "//frameworks/base/services/net", "//packages/modules/Wifi/framework", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } filegroup { diff --git a/core/java/android/net/LocalSocket.java b/core/java/android/net/LocalSocket.java index b69410cf7d73..a86396cd7c8d 100644 --- a/core/java/android/net/LocalSocket.java +++ b/core/java/android/net/LocalSocket.java @@ -196,7 +196,8 @@ public class LocalSocket implements Closeable { } /** - * Retrieves the input stream for this instance. + * Retrieves the input stream for this instance. Closing this stream is equivalent to closing + * the entire socket and its associated streams using {@link #close()}. * * @return input stream * @throws IOException if socket has been closed or cannot be created. @@ -207,7 +208,8 @@ public class LocalSocket implements Closeable { } /** - * Retrieves the output stream for this instance. + * Retrieves the output stream for this instance. Closing this stream is equivalent to closing + * the entire socket and its associated streams using {@link #close()}. * * @return output stream * @throws IOException if socket has been closed or cannot be created. diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java index bd087f970426..41dee3ab035c 100644 --- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -21,10 +21,10 @@ package android.nfc.cardemulation; import android.annotation.FlaggedApi; -import android.compat.annotation.UnsupportedAppUsage; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -374,7 +374,7 @@ public final class ApduServiceInfo implements Parcelable { // Set uid mUid = si.applicationInfo.uid; - mCategoryOtherServiceEnabled = false; // support other category + mCategoryOtherServiceEnabled = true; // support other category } diff --git a/core/java/android/nfc/flags.aconfig b/core/java/android/nfc/flags.aconfig index 17e042761dbe..0d073cc6c819 100644 --- a/core/java/android/nfc/flags.aconfig +++ b/core/java/android/nfc/flags.aconfig @@ -48,3 +48,10 @@ flag { description: "Enable NFC Polling Loop Notifications ST shim" bug: "294217286" } + +flag { + name: "enable_tag_detection_broadcasts" + namespace: "nfc" + description: "Enable sending broadcasts to Wallet role holder when a tag enters/leaves the field." + bug: "306203494" +} diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig index b56bef3c93a0..30524a1132fa 100644 --- a/core/java/android/security/flags.aconfig +++ b/core/java/android/security/flags.aconfig @@ -50,3 +50,11 @@ flag { description: "Collect sepolicy hash from sysfs" bug: "308471499" } + +flag { + name: "frp_enforcement" + namespace: "android_hw_security" + description: "This flag controls whether PDB enforces FRP" + bug: "290312729" + is_fixed_read_only: true +} diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 56066b2d813c..9c40a28dfd81 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -2050,6 +2050,7 @@ static jlong CalculateCapabilities(JNIEnv* env, jint uid, jint gid, jintArray gi } if (multiuser_get_app_id(uid) == AID_NETWORK_STACK) { + capabilities |= (1LL << CAP_WAKE_ALARM); capabilities |= (1LL << CAP_NET_ADMIN); capabilities |= (1LL << CAP_NET_BROADCAST); capabilities |= (1LL << CAP_NET_BIND_SERVICE); diff --git a/core/tests/overlaytests/Android.mk b/core/tests/overlaytests/Android.mk deleted file mode 100644 index b798d87878b7..000000000000 --- a/core/tests/overlaytests/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2017 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(call all-subdir-makefiles) diff --git a/core/tests/overlaytests/host/Android.mk b/core/tests/overlaytests/host/Android.mk deleted file mode 100644 index d58d9393c0b8..000000000000 --- a/core/tests/overlaytests/host/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -# Include to build test-apps. -include $(call all-makefiles-under,$(LOCAL_PATH)) - diff --git a/core/tests/overlaytests/host/test-apps/Android.mk b/core/tests/overlaytests/host/test-apps/Android.mk deleted file mode 100644 index 5c7187ead31f..000000000000 --- a/core/tests/overlaytests/host/test-apps/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(call all-subdir-makefiles) - diff --git a/core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.bp b/core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.bp new file mode 100644 index 000000000000..bb7d63edbebd --- /dev/null +++ b/core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.bp @@ -0,0 +1,57 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Error: Cannot get the name of the license module in the +// ./Android.bp file. +// If no such license module exists, please add one there first. +// Then reset the default_applicable_licenses property below with the license module name. +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["frameworks_base_license"], +} + +android_test_helper_app { + name: "OverlayHostTests_NonPlatformSignatureOverlay", + sdk_version: "current", + test_suites: ["device-tests"], + aaptflags: [ + "--custom-package com.android.server.om.hosttest.signature_overlay_bad", + ], +} + +android_test_helper_app { + name: "OverlayHostTests_PlatformSignatureStaticOverlay", + sdk_version: "current", + test_suites: ["device-tests"], + certificate: "platform", + manifest: "static/AndroidManifest.xml", + aaptflags: [ + "--custom-package com.android.server.om.hosttest.signature_overlay_static", + ], +} + +android_test_helper_app { + name: "OverlayHostTests_PlatformSignatureOverlay", + sdk_version: "current", + test_suites: ["device-tests"], + certificate: "platform", + aaptflags: [ + "--custom-package", + "com.android.server.om.hosttest.signature_overlay_v1", + "--version-code", + "1", + "--version-name", + "v1", + ], +} diff --git a/core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk b/core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk deleted file mode 100644 index b453cde925e4..000000000000 --- a/core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -my_package_prefix := com.android.server.om.hosttest.signature_overlay - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := OverlayHostTests_NonPlatformSignatureOverlay -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../NOTICE -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_bad -include $(BUILD_PACKAGE) - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := OverlayHostTests_PlatformSignatureStaticOverlay -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../NOTICE -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_CERTIFICATE := platform -LOCAL_MANIFEST_FILE := static/AndroidManifest.xml -LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_static -include $(BUILD_PACKAGE) - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := OverlayHostTests_PlatformSignatureOverlay -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../NOTICE -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_CERTIFICATE := platform -LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1 -LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1 -include $(BUILD_PACKAGE) - -my_package_prefix := diff --git a/core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.bp b/core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.bp new file mode 100644 index 000000000000..ee0c0e526c0a --- /dev/null +++ b/core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.bp @@ -0,0 +1,97 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Error: Cannot get the name of the license module in the +// ./Android.bp file. +// If no such license module exists, please add one there first. +// Then reset the default_applicable_licenses property below with the license module name. +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["frameworks_base_license"], +} + +android_test_helper_app { + name: "OverlayHostTests_UpdateOverlay", + srcs: ["src/**/*.java"], + sdk_version: "current", + test_suites: ["device-tests"], + static_libs: ["androidx.test.rules"], + aaptflags: ["--no-resource-removal"], +} + +android_test_helper_app { + name: "OverlayHostTests_FrameworkOverlayV1", + sdk_version: "current", + test_suites: ["device-tests"], + certificate: "platform", + aaptflags: [ + "--custom-package", + "com.android.server.om.hosttest.framework_overlay_v1", + "--version-code", + "1", + "--version-name", + "v1", + ], + resource_dirs: ["framework/v1/res"], + manifest: "framework/AndroidManifest.xml", +} + +android_test_helper_app { + name: "OverlayHostTests_FrameworkOverlayV2", + sdk_version: "current", + test_suites: ["device-tests"], + certificate: "platform", + aaptflags: [ + "--custom-package", + "com.android.server.om.hosttest.framework_overlay_v2", + "--version-code", + "2", + "--version-name", + "v2", + ], + resource_dirs: ["framework/v2/res"], + manifest: "framework/AndroidManifest.xml", +} + +android_test_helper_app { + name: "OverlayHostTests_AppOverlayV1", + sdk_version: "current", + test_suites: ["device-tests"], + aaptflags: [ + "--custom-package", + "com.android.server.om.hosttest.app_overlay_v1", + "--version-code", + "1", + "--version-name", + "v1", + ], + resource_dirs: ["app/v1/res"], + manifest: "app/v1/AndroidManifest.xml", +} + +android_test_helper_app { + name: "OverlayHostTests_AppOverlayV2", + sdk_version: "current", + test_suites: ["device-tests"], + aaptflags: [ + "--custom-package", + "com.android.server.om.hosttest.app_overlay_v2", + "--version-code", + "2", + "--version-name", + "v2", + ], + resource_dirs: ["app/v2/res"], + manifest: "app/v2/AndroidManifest.xml", +} diff --git a/core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk b/core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk deleted file mode 100644 index 77fc887e9493..000000000000 --- a/core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests -LOCAL_SRC_FILES := $(call all-java-files-under,src) -LOCAL_PACKAGE_NAME := OverlayHostTests_UpdateOverlay -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../NOTICE -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules -LOCAL_USE_AAPT2 := true -LOCAL_AAPT_FLAGS := --no-resource-removal -include $(BUILD_PACKAGE) - -my_package_prefix := com.android.server.om.hosttest.framework_overlay - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := OverlayHostTests_FrameworkOverlayV1 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../NOTICE -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_CERTIFICATE := platform -LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1 -LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1 -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/framework/v1/res -LOCAL_MANIFEST_FILE := framework/AndroidManifest.xml -include $(BUILD_PACKAGE) - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := OverlayHostTests_FrameworkOverlayV2 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../NOTICE -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_CERTIFICATE := platform -LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v2 -LOCAL_AAPT_FLAGS += --version-code 2 --version-name v2 -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/framework/v2/res -LOCAL_MANIFEST_FILE := framework/AndroidManifest.xml -include $(BUILD_PACKAGE) - -my_package_prefix := com.android.server.om.hosttest.app_overlay - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := OverlayHostTests_AppOverlayV1 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../NOTICE -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1 -LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1 -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/app/v1/res -LOCAL_MANIFEST_FILE := app/v1/AndroidManifest.xml -include $(BUILD_PACKAGE) - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := OverlayHostTests_AppOverlayV2 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../NOTICE -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v2 -LOCAL_AAPT_FLAGS += --version-code 2 --version-name v2 -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/app/v2/res -LOCAL_MANIFEST_FILE := app/v2/AndroidManifest.xml -include $(BUILD_PACKAGE) - -my_package_prefix := diff --git a/data/keyboards/Vendor_0428_Product_4001.kl b/data/keyboards/Vendor_0428_Product_4001.kl new file mode 100644 index 000000000000..7d1dd128033d --- /dev/null +++ b/data/keyboards/Vendor_0428_Product_4001.kl @@ -0,0 +1,27 @@ +# Gravis GamePad Pro USB + +# Yellow +key 0x131 BUTTON_A +# Green +key 0x132 BUTTON_B +# Red +key 0x130 BUTTON_X +# Blue +key 0x133 BUTTON_Y + +# Left Upper Shoulder "1" +key 0x134 BUTTON_L1 +# Right Upper Shoulder "1" +key 0x135 BUTTON_R1 +# Left Lower Shoulder "2" +key 0x136 BUTTON_L2 +# Right Lower Shoulder "2" +key 0x137 BUTTON_R2 + +# Select & Start +key 0x138 BUTTON_SELECT +key 0x139 BUTTON_START + +# D-Pad +axis 0x00 HAT_X +axis 0x01 HAT_Y diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java index f35eda6caef0..63ca6a52e8bf 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java @@ -336,7 +336,7 @@ public class RecentTasksController implements TaskStackListenerCallback, continue; } - final int pairedTaskId = mSplitTasks.get(taskInfo.taskId); + final int pairedTaskId = mSplitTasks.get(taskInfo.taskId, INVALID_TASK_ID); if (pairedTaskId != INVALID_TASK_ID && rawMapping.contains( pairedTaskId)) { final ActivityManager.RecentTaskInfo pairedTaskInfo = rawMapping.get(pairedTaskId); diff --git a/libs/incident/libincident.map.txt b/libs/incident/libincident.map.txt index f75cceaf59fa..d8650e129742 100644 --- a/libs/incident/libincident.map.txt +++ b/libs/incident/libincident.map.txt @@ -1,15 +1,15 @@ LIBINCIDENT { global: - AIncidentReportArgs_init; # systemapi # introduced=30 - AIncidentReportArgs_clone; # systemapi # introduced=30 - AIncidentReportArgs_delete; # systemapi # introduced=30 - AIncidentReportArgs_setAll; # systemapi # introduced=30 - AIncidentReportArgs_setPrivacyPolicy; # systemapi # introduced=30 - AIncidentReportArgs_addSection; # systemapi # introduced=30 - AIncidentReportArgs_setReceiverPackage; # systemapi # introduced=30 - AIncidentReportArgs_setReceiverClass; # systemapi # introduced=30 - AIncidentReportArgs_addHeader; # systemapi # introduced=30 - AIncidentReportArgs_takeReport; # systemapi # introduced=30 + AIncidentReportArgs_init; # systemapi introduced=30 + AIncidentReportArgs_clone; # systemapi introduced=30 + AIncidentReportArgs_delete; # systemapi introduced=30 + AIncidentReportArgs_setAll; # systemapi introduced=30 + AIncidentReportArgs_setPrivacyPolicy; # systemapi introduced=30 + AIncidentReportArgs_addSection; # systemapi introduced=30 + AIncidentReportArgs_setReceiverPackage; # systemapi introduced=30 + AIncidentReportArgs_setReceiverClass; # systemapi introduced=30 + AIncidentReportArgs_addHeader; # systemapi introduced=30 + AIncidentReportArgs_takeReport; # systemapi introduced=30 local: *; }; diff --git a/media/java/android/media/AudioHalVersionInfo.java b/media/java/android/media/AudioHalVersionInfo.java index 985a7584ffe2..efb33950022c 100644 --- a/media/java/android/media/AudioHalVersionInfo.java +++ b/media/java/android/media/AudioHalVersionInfo.java @@ -75,11 +75,10 @@ public final class AudioHalVersionInfo implements Parcelable, Comparable<AudioHa /** * List of all valid Audio HAL versions. This list need to be in sync with sAudioHALVersions - * defined in frameworks/av/media/libaudiohal/FactoryHalHidl.cpp. + * defined in frameworks/av/media/libaudiohal/FactoryHal.cpp. */ - // TODO: add AIDL_1_0 with sAudioHALVersions. public static final @NonNull List<AudioHalVersionInfo> VERSIONS = - List.of(HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0, HIDL_4_0); + List.of(AIDL_1_0, HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0, HIDL_4_0); private static final String TAG = "AudioHalVersionInfo"; private AudioHalVersion mHalVersion = new AudioHalVersion(); diff --git a/native/android/libandroid.map.txt b/native/android/libandroid.map.txt index d74f9b7bb659..985305f02a82 100644 --- a/native/android/libandroid.map.txt +++ b/native/android/libandroid.map.txt @@ -1,9 +1,9 @@ LIBANDROID { global: - AActivityManager_addUidImportanceListener; # systemapi # introduced=31 - AActivityManager_removeUidImportanceListener; # systemapi # introduced=31 - AActivityManager_isUidActive; # systemapi # introduced=31 - AActivityManager_getUidImportance; # systemapi # introduced=31 + AActivityManager_addUidImportanceListener; # systemapi introduced=31 + AActivityManager_removeUidImportanceListener; # systemapi introduced=31 + AActivityManager_isUidActive; # systemapi introduced=31 + AActivityManager_getUidImportance; # systemapi introduced=31 AAssetDir_close; AAssetDir_getNextFileName; AAssetDir_rewind; diff --git a/packages/SettingsLib/AdaptiveIcon/Android.bp b/packages/SettingsLib/AdaptiveIcon/Android.bp index 934aacfddfb9..83524a20f8df 100644 --- a/packages/SettingsLib/AdaptiveIcon/Android.bp +++ b/packages/SettingsLib/AdaptiveIcon/Android.bp @@ -14,9 +14,12 @@ android_library { resource_dirs: ["res"], static_libs: [ - "androidx.annotation_annotation", - "SettingsLibTile" + "androidx.annotation_annotation", + "SettingsLibTile", ], min_sdk_version: "21", + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index c244ca0505ed..cceead2ac62d 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -69,6 +69,9 @@ android_library { "src/**/*.java", "src/**/*.kt", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } // NOTE: Keep this module in sync with ./common.mk diff --git a/packages/SettingsLib/EmergencyNumber/Android.bp b/packages/SettingsLib/EmergencyNumber/Android.bp index 25b4905c438f..ebc830c336cc 100644 --- a/packages/SettingsLib/EmergencyNumber/Android.bp +++ b/packages/SettingsLib/EmergencyNumber/Android.bp @@ -16,4 +16,7 @@ android_library { ], sdk_version: "system_current", min_sdk_version: "21", + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SettingsLib/MainSwitchPreference/Android.bp b/packages/SettingsLib/MainSwitchPreference/Android.bp index 33aa985b32e8..a4743a4fb28c 100644 --- a/packages/SettingsLib/MainSwitchPreference/Android.bp +++ b/packages/SettingsLib/MainSwitchPreference/Android.bp @@ -28,4 +28,7 @@ android_library { "com.android.extservices", "com.android.healthfitness", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SettingsLib/RestrictedLockUtils/Android.bp b/packages/SettingsLib/RestrictedLockUtils/Android.bp index 6a8fef36a969..2f321412fea1 100644 --- a/packages/SettingsLib/RestrictedLockUtils/Android.bp +++ b/packages/SettingsLib/RestrictedLockUtils/Android.bp @@ -29,4 +29,7 @@ android_library { "//apex_available:platform", "com.android.permission", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SettingsLib/SchedulesProvider/Android.bp b/packages/SettingsLib/SchedulesProvider/Android.bp index c4373bb2dc1f..cc74feb61402 100644 --- a/packages/SettingsLib/SchedulesProvider/Android.bp +++ b/packages/SettingsLib/SchedulesProvider/Android.bp @@ -13,9 +13,12 @@ android_library { srcs: ["src/**/*.java"], static_libs: [ - "androidx.annotation_annotation", + "androidx.annotation_annotation", ], sdk_version: "system_current", min_sdk_version: "21", + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SettingsLib/SearchProvider/Android.bp b/packages/SettingsLib/SearchProvider/Android.bp index f96011ad5d09..7e31dc6ad8c2 100644 --- a/packages/SettingsLib/SearchProvider/Android.bp +++ b/packages/SettingsLib/SearchProvider/Android.bp @@ -14,4 +14,7 @@ android_library { sdk_version: "system_current", min_sdk_version: "21", + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SettingsLib/Tile/Android.bp b/packages/SettingsLib/Tile/Android.bp index cc570ccbb506..62c839b3e3f5 100644 --- a/packages/SettingsLib/Tile/Android.bp +++ b/packages/SettingsLib/Tile/Android.bp @@ -13,8 +13,11 @@ android_library { srcs: ["src/**/*.java"], static_libs: [ - "androidx.annotation_annotation", + "androidx.annotation_annotation", ], min_sdk_version: "21", + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SettingsLib/Utils/Android.bp b/packages/SettingsLib/Utils/Android.bp index dc2b52d24462..00b172dbf60d 100644 --- a/packages/SettingsLib/Utils/Android.bp +++ b/packages/SettingsLib/Utils/Android.bp @@ -30,4 +30,7 @@ android_library { "com.android.healthfitness", "com.android.permission", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SettingsLib/search/Android.bp b/packages/SettingsLib/search/Android.bp index 918d696fa481..9ae2dd77dc3e 100644 --- a/packages/SettingsLib/search/Android.bp +++ b/packages/SettingsLib/search/Android.bp @@ -12,6 +12,9 @@ java_library { visibility: ["//visibility:private"], srcs: ["interface-src/**/*.java"], host_supported: true, + lint: { + baseline_filename: "lint-baseline.xml", + }, } android_library { @@ -23,6 +26,9 @@ android_library { sdk_version: "system_current", min_sdk_version: "21", + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_plugin { diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp index ca30e159a0ff..e2d27f15b78a 100644 --- a/packages/SystemUI/shared/Android.bp +++ b/packages/SystemUI/shared/Android.bp @@ -34,6 +34,9 @@ java_library { srcs: [ ":statslog-SystemUI-java-gen", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } android_library { @@ -66,6 +69,9 @@ android_library { min_sdk_version: "current", plugins: ["dagger2-compiler"], kotlincflags: ["-Xjvm-default=all"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library { @@ -77,6 +83,9 @@ java_library { static_kotlin_stdlib: false, java_version: "1.8", min_sdk_version: "current", + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library { @@ -96,4 +105,7 @@ java_library { }, java_version: "1.8", min_sdk_version: "current", + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/packages/SystemUI/unfold/Android.bp b/packages/SystemUI/unfold/Android.bp index 1f0181f2e5bd..a1617a6ccc28 100644 --- a/packages/SystemUI/unfold/Android.bp +++ b/packages/SystemUI/unfold/Android.bp @@ -38,4 +38,7 @@ android_library { sdk_version: "current", min_sdk_version: "current", plugins: ["dagger2-compiler"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/services/backup/Android.bp b/services/backup/Android.bp index b086406a2ad5..f959ef4ceef5 100644 --- a/services/backup/Android.bp +++ b/services/backup/Android.bp @@ -20,4 +20,7 @@ java_library_static { srcs: [":services.backup-sources"], libs: ["services.core"], static_libs: ["app-compat-annotations"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/services/companion/Android.bp b/services/companion/Android.bp index a248d9e55a8a..de44378ea6dd 100644 --- a/services/companion/Android.bp +++ b/services/companion/Android.bp @@ -27,4 +27,7 @@ java_library_static { static_libs: [ "ukey2_jni", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/services/core/Android.bp b/services/core/Android.bp index 8d88b611e20a..21cfd242cf45 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -199,6 +199,9 @@ java_library_static { "-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_genrule { @@ -217,6 +220,9 @@ java_genrule { java_library { name: "services.core", static_libs: ["services.core.priorityboosted"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library_host { diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index b555a52fe720..39d9b45bb22d 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -12053,12 +12053,16 @@ public class AudioService extends IAudioService.Stub public @Nullable AudioHalVersionInfo getHalVersion() { for (AudioHalVersionInfo version : AudioHalVersionInfo.VERSIONS) { try { - // TODO: check AIDL service. String versionStr = version.getMajorVersion() + "." + version.getMinorVersion(); - HwBinder.getService( - String.format("android.hardware.audio@%s::IDevicesFactory", versionStr), - "default"); - return version; + final String aidlStr = "android.hardware.audio.core.IModule/default"; + final String hidlStr = String.format("android.hardware.audio@%s::IDevicesFactory", + versionStr); + if (null != ServiceManager.checkService(aidlStr)) { + return version; + } else { + HwBinder.getService(hidlStr, "default"); + return version; + } } catch (NoSuchElementException e) { // Ignore, the specified HAL interface is not found. } catch (RemoteException re) { diff --git a/services/core/java/com/android/server/net/NetworkPolicyLogger.java b/services/core/java/com/android/server/net/NetworkPolicyLogger.java index 85731651dd59..4d19eade5a05 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyLogger.java +++ b/services/core/java/com/android/server/net/NetworkPolicyLogger.java @@ -42,6 +42,7 @@ import android.util.ArraySet; import android.util.Log; import android.util.Slog; +import com.android.internal.annotations.Keep; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.RingBuffer; import com.android.server.am.ProcessList; @@ -693,6 +694,7 @@ public class NetworkPolicyLogger { * Note: This class needs to be public for RingBuffer class to be able to create * new instances of this. */ + @Keep public static final class Data { public int type; public long timeStamp; diff --git a/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java b/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java index bfc17713b6a8..336bfdd0fb14 100644 --- a/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java +++ b/services/usage/java/com/android/server/usage/BroadcastResponseStatsLogger.java @@ -35,6 +35,7 @@ import android.util.Slog; import android.util.TimeUtils; import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.Keep; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.RingBuffer; import com.android.server.usage.BroadcastResponseStatsTracker.NotificationEventType; @@ -178,6 +179,7 @@ public class BroadcastResponseStatsLogger { } } + @Keep public static final class BroadcastEvent implements Data { public int sourceUid; public int targetUserId; @@ -198,6 +200,7 @@ public class BroadcastResponseStatsLogger { } } + @Keep public static final class NotificationEvent implements Data { public int type; public String packageName; diff --git a/services/usb/Android.bp b/services/usb/Android.bp index 9f3b52eddd67..826cf8e2b25e 100644 --- a/services/usb/Android.bp +++ b/services/usb/Android.bp @@ -35,4 +35,7 @@ java_library_static { "android.hardware.usb-V1.3-java", "android.hardware.usb-V2-java", ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } |