commit f0885c77948b16a93900bdaa312a7f362db8223d
author Dianne Hackborn <nobody@android.com> Wed May 13 18:15:19 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed May 13 18:15:19 2009 -0700
tree cf77ab42e16ec3cb5ed124d73bf2a073033414a4
parent 560d210225f582f4691f4e60bdbf26e5f303a4c6
parent b91081113692acc87ae67f235956ae1cecab68cc

am b910811: am 5d6d773: AI 148824: Fix issue #1851541 (sharedUserId requ

Merge commit 'b91081113692acc87ae67f235956ae1cecab68cc'

* commit 'b91081113692acc87ae67f235956ae1cecab68cc':
  AI 148824: Fix issue #1851541 (sharedUserId requests not being checked for matching signatures on .apk).

services/java/com/android/server/PackageManagerService.java

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index bee1530..adc4de8 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -5647,6 +5647,7 @@
                 }
                 p = new PackageSetting(name, codePath, resourcePath, vc, pkgFlags);
                 p.setTimeStamp(codePath.lastModified());
+                p.sharedUser = sharedUser;
                 if (sharedUser != null) {
                     p.userId = sharedUser.userId;
                 } else if (MULTIPLE_APPLICATION_UIDS) {