Commit: 528c64e205bf1d8f8237fb4e582d152958345b92 - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revision: 528c64e205bf1d8f8237fb4e582d152958345b92 (tree)
• Time: 2015-02-02 20:22:02
• Author: Robin Lee <rgl@goog...>
• Commiter: Android (Google) Code Review

Log Message

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

Change Summary

• modified: src/com/android/settings/CredentialStorage.java

Incremental Difference

--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -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();