commit d16231de248aeb5aeccb8f4aa226a2f1b34cc082
author Robin Lee <rgl@google.com> Mon Feb 02 11:28:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 02 11:28:42 2015 +0000
tree ac228fdc2ce902f4665b65d5a2f02755f824a6be
parent f99df057acb077e7601ec11d27be1bca0265247b
parent 528c64e205bf1d8f8237fb4e582d152958345b92

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

* commit '528c64e205bf1d8f8237fb4e582d152958345b92':
  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();