diff options
author | Jeff Sharkey <jsharkey@google.com> | 2021-07-14 23:25:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-07-14 23:25:08 +0000 |
commit | 9d0ddef67b6bfabac10b0c6ea07df36f037eb0cf (patch) | |
tree | f639101d8670647a34a984b52d097cc74e75ce9d | |
parent | 6cc2381562e792f9033dd1b941d2737c52ccbdb7 (diff) | |
parent | 38ffbde17ee75e212f09ea5ac66859250b862a01 (diff) | |
download | base-9d0ddef67b6bfabac10b0c6ea07df36f037eb0cf.tar.gz |
Merge "Root UID can synthesize AttributionSource values." into sc-dev
-rw-r--r-- | core/java/android/content/AttributionSource.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java index 0e22705146af..bdb7900b5bb9 100644 --- a/core/java/android/content/AttributionSource.java +++ b/core/java/android/content/AttributionSource.java @@ -252,7 +252,8 @@ public final class AttributionSource implements Parcelable { */ public boolean checkCallingUid() { final int callingUid = Binder.getCallingUid(); - if (callingUid != Process.SYSTEM_UID + if (callingUid != Process.ROOT_UID + && callingUid != Process.SYSTEM_UID && callingUid != mAttributionSourceState.uid) { return false; } |