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

Commit 95e074da authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Autofill fixes for secondary users:" into oc-dev 

am: 6358cdcd

Change-Id: I57f715b886515d53c25104b9952597a961fb3ca2
parents 5d45ac6e 6358cdcd

services/autofill/java/com/android/server/autofill/AutofillManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,12 @@ public final class AutofillManagerService extends SystemService { 
        }

    }



    @Override

    public void onSwitchUser(int userHandle) {

        if (sDebug) Slog.d(TAG, "Hiding UI when user switched");

        mUi.hideAll(null);

    }



    @Override

    public void onCleanupUser(int userId) {

        synchronized (mLock) {

services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -360,8 +360,7 @@ final class AutofillManagerServiceImpl { 
    }



    void disableOwnedAutofillServicesLocked(int uid) {

        if (mInfo == null || mInfo.getServiceInfo().applicationInfo.uid

                != UserHandle.getAppId(uid)) {

        if (mInfo == null || mInfo.getServiceInfo().applicationInfo.uid != uid) {

            return;

        }

        final long identity = Binder.clearCallingIdentity();

services/autofill/java/com/android/server/autofill/ui/SaveUi.java

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ final class SaveUi { 
                | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM

                | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH);

        window.addPrivateFlags(WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS);

        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);

        window.setGravity(Gravity.BOTTOM | Gravity.CENTER);

        window.setCloseOnTouchOutside(true);