Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d16231de authored by Robin Lee's avatar Robin Lee Committed by Android Git Automerger
Browse files

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

* commit '528c64e2':
  Repair broken keychain wifi_uid logic
parents f99df057 528c64e2

src/com/android/settings/CredentialStorage.java

+2 −2
Original line number Diff line number Diff line
@@ -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();