PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: d16231d

* commit 'd16231de248aeb5aeccb8f4aa226a2f1b34cc082':
  Repair broken keychain wifi_uid logic
This commit is contained in:
Robin Lee
2015-02-02 11:45:57 +00:00
committed by android-build-merger
parent 55ebba9bed d16231de24
commit 70dbf05d50
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/CredentialStorage.java
View File

@@ -223,9 +223,9 @@ public final class CredentialStorage extends Activity {
Bundle bundle = mInstallBundle; Bundle bundle = mInstallBundle;
mInstallBundle = null; 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 dstUserId = UserHandle.getUserId(uid);
int myUserId = UserHandle.myUserId(); int myUserId = UserHandle.myUserId();