| commit | df8677053f3455c9b93dee2c06f589bba184995c | [log] [tgz] |
|---|---|---|
| author | Nikhil Kumar <nykkumar@google.com> | Tue Apr 18 09:27:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 18 09:27:37 2023 +0000 |
| tree | 236185a0ef90f421e59b0fb03bfdbd94e23c1be1 | |
| parent | e3c6a0dc8825334cdfcc80642acdf13930a41586 [diff] | |
| parent | 532a1cc165aa8f8385dc02b3299ccd18fadad6cb [diff] |
Merge "Use current user to verify the app getting installed on all users" into udc-dev am: 639da49961 am: 532a1cc165 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22628298 Change-Id: I83ce26f94ee3bfc07c0df8bf8b8b2abc57f3613e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/pm/VerifyingSession.java b/services/core/java/com/android/server/pm/VerifyingSession.java index 5015985..7198de2 100644 --- a/services/core/java/com/android/server/pm/VerifyingSession.java +++ b/services/core/java/com/android/server/pm/VerifyingSession.java
@@ -353,11 +353,10 @@ PackageInfoLite pkgLite, PackageVerificationState verificationState) { - // TODO: http://b/22976637 - // Apps installed for "all" users use the device owner to verify the app + // Apps installed for "all" users use the current user to verify the app UserHandle verifierUser = getUser(); if (verifierUser == UserHandle.ALL) { - verifierUser = UserHandle.SYSTEM; + verifierUser = UserHandle.of(mPm.mUserManager.getCurrentUserId()); } final int verifierUserId = verifierUser.getIdentifier();