summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yuting Fang <yutingfang@google.com> 2024-05-17 22:15:29 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-17 22:15:29 +0000
commitf5bd0fcdabe8da338fd35118e66db04c90b70d79 (patch)
tree9a2d6c79187a812e4f7131df9e3eb52b8f0021aa
parentc362aa83004b2d18de78f816fc9365fc72bc855f (diff)
parent5ee3900359d64d95c6b78d89a0f6d0824a310e83 (diff)
Merge "Add javadoc to system api OpEventProxyInfo.getDeviceId()" into main
-rw-r--r--core/java/android/app/AppOpsManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 54f69099e081..6865f9c5013b 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -3583,6 +3583,9 @@ public class AppOpsManager {
return mAttributionTag;
}
+ /**
+ * Persistent device Id of the proxy that noted the op
+ */
@FlaggedApi(Flags.FLAG_DEVICE_ID_IN_OP_PROXY_INFO_ENABLED)
public @Nullable String getDeviceId() { return mDeviceId; }