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

Unverified Commit ef60e423 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r75' into staging/lineage-20.0_merge-android-13.0.0_r75 

Android 13.0.0 release 75

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZQiSvgAKCRDorT+BmrEO
# eCrHAJ9W/MTfOMGyaxEfujTBFqkwW7FouQCbB5MeQpNgGalBC0RXhE7zHJdATmw=
# =jKbp
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Sep 18 21:11:10 2023 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1890 signatures in the past
#      22 months.  Encrypted 4 messages in the past 20 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Robin Lee (2) and others
# Via Android Build Coastguard Worker
* tag 'android-13.0.0_r75':
  Improve user handling when querying for resumable media
  Update AccountManagerService checkKeyIntentParceledCorrectly.
  Forbid granting access to NLSes with too-long component names
  Ignore virtual presentation windows - RESTRICT AUTOMERGE
  [DO NOT MERGE] Update quickshare intent rather than recreating
  Keyguard: use transition state for syncing occlude [RESTRICT AUTOMERGE]
  Cancel current animation instead of candidate

 Conflicts:
	packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
	packages/SystemUI/tests/src/com/android/systemui/media/controls/resume/MediaResumeListenerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/media/controls/resume/ResumeMediaBrowserTest.kt
	packages/SystemUI/tests/src/com/android/systemui/screenshot/SaveImageInBackgroundTaskTest.kt

Change-Id: I9eaa285bb1e63d480358fefa55a6356cf138448a
parents acd73062 292f8964

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -572,9 +572,6 @@ 
         docked if the dock is configured to enable the accelerometer. -->

    <bool name="config_supportAutoRotation">true</bool>



    <!-- If true, allows rotation resolver service to help resolve screen rotation. -->

    <bool name="config_allowRotationResolver">true</bool>



    <!-- If true, the screen can be rotated via the accelerometer in all 4

         rotations as the default behavior. -->

    <bool name="config_allowAllRotations">false</bool>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -1755,7 +1755,6 @@ 
  <java-symbol type="bool" name="config_perDisplayFocusEnabled" />

  <java-symbol type="bool" name="config_showNavigationBar" />

  <java-symbol type="bool" name="config_supportAutoRotation" />

  <java-symbol type="bool" name="config_allowRotationResolver" />

  <java-symbol type="bool" name="config_dockedStackDividerFreeSnapMode" />

  <java-symbol type="dimen" name="docked_stack_divider_thickness" />

  <java-symbol type="dimen" name="docked_stack_divider_insets" />

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+4 −0
Original line number Diff line number Diff line
@@ -727,6 +727,10 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        getRefBounds2(mTempRect);

        t.setPosition(leash2, mTempRect.left, mTempRect.top)

                .setWindowCrop(leash2, mTempRect.width(), mTempRect.height());

        // Make right or bottom side surface always higher than left or top side to avoid weird

        // animation when dismiss split. e.g. App surface fling above on decor surface.

        t.setLayer(leash1, 1);

        t.setLayer(leash2, 2);



        if (mImePositionProcessor.adjustSurfaceLayoutForIme(

                t, dividerLeash, leash1, leash2, dimLayer1, dimLayer2)) {

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+41 −19
Original line number Diff line number Diff line
@@ -468,10 +468,26 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    RemoteAnimationTarget[] wallpapers,

                    RemoteAnimationTarget[] nonApps,

                    final IRemoteAnimationFinishedCallback finishedCallback) {

                if (isEnteringSplit && mSideStage.getChildCount() == 0) {

                boolean openingToSide = false;

                if (apps != null) {

                    for (int i = 0; i < apps.length; ++i) {

                        if (apps[i].mode == MODE_OPENING

                                && mSideStage.containsTask(apps[i].taskId)) {

                            openingToSide = true;

                            break;

                        }

                    }

                } else if (mSideStage.getChildCount() != 0) {

                    // There are chances the entering app transition got canceled by performing

                    // rotation transition. Checks if there is any child task existed in split

                    // screen before fallback to cancel entering flow.

                    openingToSide = true;

                }



                if (isEnteringSplit && !openingToSide) {

                    mMainExecutor.execute(() -> exitSplitScreen(

                            null /* childrenToTop */, EXIT_REASON_UNKNOWN));

                    mSplitUnsupportedToast.show();

                            mSideStage.getChildCount() == 0 ? mMainStage : mSideStage,

                            EXIT_REASON_UNKNOWN));

                }



                if (finishedCallback != null) {
@@ -556,10 +572,26 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps,

                    IRemoteAnimationFinishedCallback finishedCallback,

                    SurfaceControl.Transaction t) {

                if (isEnteringSplit && mSideStage.getChildCount() == 0) {

                boolean openingToSide = false;

                if (apps != null) {

                    for (int i = 0; i < apps.length; ++i) {

                        if (apps[i].mode == MODE_OPENING

                                && mSideStage.containsTask(apps[i].taskId)) {

                            openingToSide = true;

                            break;

                        }

                    }

                } else if (mSideStage.getChildCount() != 0) {

                    // There are chances the entering app transition got canceled by performing

                    // rotation transition. Checks if there is any child task existed in split

                    // screen before fallback to cancel entering flow.

                    openingToSide = true;

                }



                if (isEnteringSplit && !openingToSide && apps != null) {

                    mMainExecutor.execute(() -> exitSplitScreen(

                            null /* childrenToTop */, EXIT_REASON_UNKNOWN));

                    mSplitUnsupportedToast.show();

                            mSideStage.getChildCount() == 0 ? mMainStage : mSideStage,

                            EXIT_REASON_UNKNOWN));

                }



                if (apps != null) {
@@ -1002,7 +1034,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    private void onRemoteAnimationFinishedOrCancelled(WindowContainerTransaction evictWct) {

        mIsDividerRemoteAnimating = false;

        mShouldUpdateRecents = true;

        clearRequestIfPresented();

        mSplitRequest = null;

        // If any stage has no child after animation finished, it means that split will display

        // nothing, such status will happen if task and intent is same app but not support

        // multi-instance, we should exit split and expand that app as full screen.
@@ -1022,7 +1054,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    private void onRemoteAnimationFinished(RemoteAnimationTarget[] apps) {

        mIsDividerRemoteAnimating = false;

        mShouldUpdateRecents = true;

        clearRequestIfPresented();

        mSplitRequest = null;

        // If any stage has no child after finished animation, that side of the split will display

        // nothing. This might happen if starting the same app on the both sides while not

        // supporting multi-instance. Exit the split screen and expand that app to full screen.
@@ -1288,7 +1320,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        });

        mShouldUpdateRecents = false;

        mIsDividerRemoteAnimating = false;

        mSplitRequest = null;



        mSplitLayout.getInvisibleBounds(mTempRect1);

        if (childrenToTop == null || childrenToTop.getTopVisibleChildTaskId() == INVALID_TASK_ID) {
@@ -1381,13 +1412,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        }

    }



    private void clearRequestIfPresented() {

        if (mSideStageListener.mVisible && mSideStageListener.mHasChildren

                && mMainStageListener.mVisible && mSideStageListener.mHasChildren) {

            mSplitRequest = null;

        }

    }



    /**

     * Returns whether the split pair in the recent tasks list should be broken.

     */
@@ -1752,7 +1776,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    true /* setReparentLeafTaskIfRelaunch */);

            setRootForceTranslucent(true, wct);

        } else {

            clearRequestIfPresented();

            wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,

                    false /* setReparentLeafTaskIfRelaunch */);

            setRootForceTranslucent(false, wct);
@@ -1903,7 +1926,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        }

        if (mMainStageListener.mHasChildren && mSideStageListener.mHasChildren) {

            mShouldUpdateRecents = true;

            clearRequestIfPresented();

            mSplitRequest = null;

            updateRecentTasksSplitPair();



            if (!mLogger.hasStartedSession()) {
@@ -2542,7 +2565,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            }

        });

        mShouldUpdateRecents = false;

        mSplitRequest = null;



        // Update local states.

        setSplitsVisible(false);

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java

+12 −7
Original line number Diff line number Diff line
@@ -220,12 +220,20 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
                mCallbacks.onNoLongerSupportMultiWindow();

                return;

            }

            if (taskInfo.topActivity == null && mChildrenTaskInfo.contains(taskInfo.taskId)

                    && mChildrenTaskInfo.get(taskInfo.taskId).topActivity != null) {

                // If top activity become null, it means the task is about to vanish, we use this

                // signal to remove it from children list earlier for smooth dismiss transition.

                mChildrenTaskInfo.remove(taskInfo.taskId);

                mChildrenLeashes.remove(taskInfo.taskId);

            } else {

                mChildrenTaskInfo.put(taskInfo.taskId, taskInfo);

            }

            mCallbacks.onChildTaskStatusChanged(taskInfo.taskId, true /* present */,

                    taskInfo.isVisible);

            if (!ENABLE_SHELL_TRANSITIONS) {

                updateChildTaskSurface(

                        taskInfo, mChildrenLeashes.get(taskInfo.taskId), false /* firstAppeared */);

            if (!ENABLE_SHELL_TRANSITIONS && mChildrenLeashes.contains(taskInfo.taskId)) {

                updateChildTaskSurface(taskInfo, mChildrenLeashes.get(taskInfo.taskId),

                        false /* firstAppeared */);

            }

        } else {

            throw new IllegalArgumentException(this + "\n Unknown task: " + taskInfo
@@ -259,9 +267,6 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
                return;

            }

            sendStatusChanged();

        } else {

            throw new IllegalArgumentException(this + "\n Unknown task: " + taskInfo

                    + "\n mRootTaskInfo: " + mRootTaskInfo);

        }

    }