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

Commit a95601c7 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Update IME SECURE flag if Window updates SECURE flag" into tm-dev am: 0e11b2c7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17590912



Change-Id: I1f279733a856566730ffc741e67f1dbfdd56d08e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a6025b4 0e11b2c7

services/core/java/com/android/server/am/BroadcastDispatcher.java

+5 −0
Original line number Diff line number Diff line
@@ -580,6 +580,11 @@ public class BroadcastDispatcher { 
    // ----------------------------------

    // BroadcastQueue operation support

    void enqueueOrderedBroadcastLocked(BroadcastRecord r) {

        if (r.receivers == null || r.receivers.isEmpty()) {

            mOrderedBroadcasts.add(r);

            return;

        }



        if (Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(r.intent.getAction())) {

            // Create one BroadcastRecord for each UID that can be deferred.

            final SparseArray<BroadcastRecord> deferred =

services/core/java/com/android/server/am/BroadcastRecord.java

+4 −0
Original line number Diff line number Diff line
@@ -414,6 +414,10 @@ final class BroadcastRecord extends Binder { 
            return ret;

        }



        if (receivers == null) {

            return ret;

        }



        final String action = intent.getAction();

        if (!Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(action)

                && !Intent.ACTION_BOOT_COMPLETED.equals(action)) {

services/core/java/com/android/server/wm/DisplayContent.java

+10 −2
Original line number Diff line number Diff line
@@ -4048,12 +4048,20 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    @VisibleForTesting

    void setImeInputTarget(InputTarget target) {

        mImeInputTarget = target;

        boolean canScreenshot = mImeInputTarget == null || mImeInputTarget.canScreenshotIme();

        if (mImeWindowsContainer.setCanScreenshot(canScreenshot)) {

        if (refreshImeSecureFlag(getPendingTransaction())) {

            mWmService.requestTraversal();

        }

    }



    /**

     * Re-check the IME target's SECURE flag since it's possible to have changed after the target

     * was set.

     */

    boolean refreshImeSecureFlag(Transaction t) {

        boolean canScreenshot = mImeInputTarget == null || mImeInputTarget.canScreenshotIme();

        return mImeWindowsContainer.setCanScreenshot(t, canScreenshot);

    }



    @VisibleForTesting

    void setImeControlTarget(InsetsControlTarget target) {

        mImeControlTarget = target;

services/core/java/com/android/server/wm/WindowContainer.java

+2 −2
Original line number Diff line number Diff line
@@ -3782,11 +3782,11 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        return INVALID_WINDOW_TYPE;

    }



    boolean setCanScreenshot(boolean canScreenshot) {

    boolean setCanScreenshot(Transaction t, boolean canScreenshot) {

        if (mSurfaceControl == null) {

            return false;

        }

        getPendingTransaction().setSecure(mSurfaceControl, !canScreenshot);

        t.setSecure(mSurfaceControl, !canScreenshot);

        return true;

    }

services/core/java/com/android/server/wm/WindowSurfaceController.java

+5 −0
Original line number Diff line number Diff line
@@ -217,6 +217,11 @@ class WindowSurfaceController { 
        mService.openSurfaceTransaction();

        try {

            getGlobalTransaction().setSecure(mSurfaceControl, isSecure);



            final DisplayContent dc = mAnimator.mWin.mDisplayContent;

            if (dc != null) {

                dc.refreshImeSecureFlag(getGlobalTransaction());

            }

        } finally {

            mService.closeSurfaceTransaction("setSecure");

            if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG, "<<< CLOSE TRANSACTION setSecureLocked");