diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-04-13 11:54:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 11:54:57 +0000 |
| commit | 155b09614e3fb3bda5aec3af650e9c9080bcfd73 (patch) | |
| tree | ca8c10795c5156b9ac89234acc9dba311fdd1e89 /core/java | |
| parent | b92605cc817f2194917e4a3dbb6d96f317254945 (diff) | |
| parent | 6b7167e80704992929c68d49c6e4226ab42c4dea (diff) | |
Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 am: 6b7167e807
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/UserHandle.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index 7b62e6652a04..d065d7a0df83 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -303,16 +303,15 @@ public final class UserHandle implements Parcelable { } /** - * Returns the uid that is composed from the userHandle and the appId. + * Returns the uid representing the given appId for this UserHandle. * - * @param userHandle the UserHandle to compose the uid * @param appId the AppId to compose the uid - * @return the uid that is composed from the userHandle and the appId + * @return the uid representing the given appId for this UserHandle * @hide */ @SystemApi - public static int getUid(@NonNull UserHandle userHandle, @AppIdInt int appId) { - return getUid(userHandle.getIdentifier(), appId); + public int getUid(@AppIdInt int appId) { + return getUid(getIdentifier(), appId); } /** |