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

Commit 635426b0 authored by Robin Lee's avatar Robin Lee
Browse files

Repair broken keychain wifi_uid logic 

Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.

Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
parent ab845180

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();