Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.
Bug:
19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
Bundle bundle = mInstallBundle;
mInstallBundle = null;
- final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
+ final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyStore.UID_SELF);
- if (!UserHandle.isSameUser(uid, Process.myUid())) {
+ if (uid != KeyStore.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())) {
int dstUserId = UserHandle.getUserId(uid);
int myUserId = UserHandle.myUserId();