diff options
| author | Robin Lee <rgl@google.com> | 2015-02-02 11:45:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-02 11:45:57 +0000 |
| commit | 70dbf05d50f29685f0754a35c96fe2b041b5ac2f (patch) | |
| tree | 6f3ef61b88b9fe16ff7692642ce1f7f9fe7a1d55 | |
| parent | 55ebba9bedcfec79586426ccebda55b5b7af45f9 (diff) | |
| parent | d16231de248aeb5aeccb8f4aa226a2f1b34cc082 (diff) | |
| download | packages_apps_Settings-70dbf05d50f29685f0754a35c96fe2b041b5ac2f.zip packages_apps_Settings-70dbf05d50f29685f0754a35c96fe2b041b5ac2f.tar.gz packages_apps_Settings-70dbf05d50f29685f0754a35c96fe2b041b5ac2f.tar.bz2 | |
am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
automerge: d16231d
* commit 'd16231de248aeb5aeccb8f4aa226a2f1b34cc082':
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(); |