diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2021-07-14 23:38:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-14 23:38:05 +0000 |
| commit | e4f4fa91e2b72bb8eaafa97af6877c31ea1e417e (patch) | |
| tree | da7005d6c9cefecab5b3ff32c9a4c2a9f817909f /core/java/android | |
| parent | 7ad90fa3ffee10bf79778ba16f3d03b6189b9996 (diff) | |
| parent | 9d0ddef67b6bfabac10b0c6ea07df36f037eb0cf (diff) | |
Merge "Root UID can synthesize AttributionSource values." into sc-dev am: 9d0ddef67b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15285879
Change-Id: I3bc83265bcbc9cc09167e0d73916f28156a64fe8
Diffstat (limited to 'core/java/android')
| -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; } |