am 70dbf05d: am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev automerge: d16231d

* commit '70dbf05d50f29685f0754a35c96fe2b041b5ac2f':
  Repair broken keychain wifi_uid logic
This commit is contained in:
Robin Lee
2015-02-02 11:51:53 +00:00
committed by Android Git Automerger

View File

@@ -223,9 +223,9 @@ public final class CredentialStorage extends Activity {
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();