aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-30 20:52:50 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-30 20:52:50 +0000
commit791da864ab46d6d78b03822241d81fae19eccee2 (patch)
tree5eb33ff1455df02e1f95d901a7cdfa92120b774e
parent03b381e2793bfce026b29a76e35f70e88aeda7b2 (diff)
parent4149acbef2692e09ae18dbb3f467e78c88d7afb9 (diff)
downloadmodules-utils-791da864ab46d6d78b03822241d81fae19eccee2.tar.gz
Snap for 11024862 from 4149acbef2692e09ae18dbb3f467e78c88d7afb9 to simpleperf-release
Change-Id: I2fc79c47160c02b2f9eb75865ab6694593173b8b
-rw-r--r--java/Android.bp1
-rw-r--r--java/android/annotation/UserHandleAware.java4
2 files changed, 3 insertions, 2 deletions
diff --git a/java/Android.bp b/java/Android.bp
index f51d3d4..a1ab7a3 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -115,6 +115,7 @@ filegroup {
visibility: [
"//frameworks/libs/modules-utils/java/com/android/modules/utils",
"//packages/modules/Bluetooth/system/binder",
+ "//packages/modules/Bluetooth/android/app/aidl",
],
}
diff --git a/java/android/annotation/UserHandleAware.java b/java/android/annotation/UserHandleAware.java
index 60dcbd8..2c3badc 100644
--- a/java/android/annotation/UserHandleAware.java
+++ b/java/android/annotation/UserHandleAware.java
@@ -38,9 +38,9 @@ import java.lang.annotation.Target;
* public abstract PackageInfo getPackageInfo({@literal @}NonNull String packageName,
* {@literal @}PackageInfoFlags int flags) throws NameNotFoundException;
* }</pre>
+ * This method uses {@linkplain android.content.Context#getUser()} or
+ * {@linkplain android.content.Context#getUserId()} to execute across users.
*
- * @memberDoc This method uses {@linkplain android.content.Context#getUser}
- * or {@linkplain android.content.Context#getUserId} to execute across users.
* @hide
*/
@Retention(SOURCE)