commit 0b88b75aaffbe0be073b75bfc823f83240c3b92e
author Robin Lee <rgl@google.com> Mon Feb 02 11:51:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 02 11:51:53 2015 +0000
tree 50e597e6e010f66f747037b1f467c76329b0b49c
parent 53a46a3f582916fa0dd1b21746da8458a2fb3ce3
parent 70dbf05d50f29685f0754a35c96fe2b041b5ac2f

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

src/com/android/settings/CredentialStorage.java

diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 40bed90..60803dc 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -223,9 +223,9 @@
         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();