diff options
| author | Robin Lee <rgl@google.com> | 2015-02-02 11:33:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-02 11:33:23 +0000 |
| commit | 56be3cd00afab4a6aa5e6830be710c765e4253f0 (patch) | |
| tree | 5baec4e206d2e6d6316d6d602fa03a07edac86d7 | |
| parent | f3b7e5fc919f237f48b66d7313039cef47ccec71 (diff) | |
| parent | 528c64e205bf1d8f8237fb4e582d152958345b92 (diff) | |
| download | packages_apps_Settings-56be3cd00afab4a6aa5e6830be710c765e4253f0.zip packages_apps_Settings-56be3cd00afab4a6aa5e6830be710c765e4253f0.tar.gz packages_apps_Settings-56be3cd00afab4a6aa5e6830be710c765e4253f0.tar.bz2 | |
am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
* commit '528c64e205bf1d8f8237fb4e582d152958345b92':
Repair broken keychain wifi_uid logic
| -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(); |