Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev

This commit is contained in:
Robin Lee
2015-02-02 11:22:01 +00:00
committed by Android (Google) Code Review

View File

@@ -223,9 +223,9 @@ public final class CredentialStorage extends Activity {
Bundle bundle = mInstallBundle; Bundle bundle = mInstallBundle;
mInstallBundle = null; 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 dstUserId = UserHandle.getUserId(uid);
int myUserId = UserHandle.myUserId(); int myUserId = UserHandle.myUserId();