diff options
| author | Robin Lee <rgl@google.com> | 2015-02-02 11:22:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-02 11:22:02 +0000 |
| commit | 528c64e205bf1d8f8237fb4e582d152958345b92 (patch) | |
| tree | 82ab93926c47ad7ca046a40b146089fa5f212e39 | |
| parent | a46c7236b6d71c861b49d20dd7515a9031764909 (diff) | |
| parent | 635426b0a7db8791bc62836921d3b2f22b36acea (diff) | |
| download | packages_apps_Settings-528c64e205bf1d8f8237fb4e582d152958345b92.zip packages_apps_Settings-528c64e205bf1d8f8237fb4e582d152958345b92.tar.gz packages_apps_Settings-528c64e205bf1d8f8237fb4e582d152958345b92.tar.bz2 | |
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
| -rw-r--r-- | src/com/android/settings/CredentialStorage.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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(); |