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

Commit f0a6fdbf authored by Bryce Lee's avatar Bryce Lee
Browse files

Allow opening activity to specify orientation. 



An activity's window is initially not visible. This means it is not
accounted for until it becomes visible, which means requested
orientations will not be honored until after onCreate.

This changelist removes the visibility check previously used determining
the orientation.

This changelist also addresses an issue where an ActivityRecord member
variable tracking the last configuration sent was not being initially
updated.

Fixes: 33844887
Fixes: 33814250
Fixes: 34165818
Fixes: 34177026
Fixes: 33809086
Fixes: 34111451

Test: Verified reported issues fixed in apps mentioned in bugs
Test: Added additional unit tests to exercise override getOrientation.

Change-Id: I26b7e808b6f3d857543e3a187b6c318e88afa063
Signed-off-by: default avatarBryce Lee <brycelee@google.com>
parent 9f5d2b08

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

+13 −2
Original line number Diff line number Diff line
@@ -1899,11 +1899,22 @@ final class ActivityRecord implements AppWindowContainerListener { 
                task.taskId, requestedOrientation);

    }



    // TODO: now used only in one place to address race-condition. Remove when that will be fixed.

    void setLastReportedConfiguration(@NonNull Configuration config) {

    /**

     * Set the last reported global configuration to the client. Should be called whenever a new

     * global configuration is sent to the client for this activity.

     */

    void setLastReportedGlobalConfiguration(@NonNull Configuration config) {

        mLastReportedConfiguration.setTo(config);

    }



    /**

     * Set the last reported merged configuration to the client. Should be called whenever a new

     * merged configuration is sent to the client for this activity.

     */

    void setLastReportedMergedOverrideConfiguration(@NonNull Configuration config) {

        mLastReportedOverrideConfiguration.setTo(config);

    }



    /** Call when override config was sent to the Window Manager to update internal records. */

    void onOverrideConfigurationSent() {

        mLastReportedOverrideConfiguration.setTo(task.getMergedOverrideConfiguration());

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

+11 −3
Original line number Diff line number Diff line
@@ -1333,10 +1333,18 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
            // Because we could be starting an Activity in the system process this may not go across

            // a Binder interface which would create a new Configuration. Consequently we have to

            // always create a new Configuration here.



            final Configuration globalConfiguration =

                new Configuration(mService.getGlobalConfiguration());

            r.setLastReportedGlobalConfiguration(globalConfiguration);

            final Configuration mergedOverrideConfiguration =

                new Configuration(task.getMergedOverrideConfiguration());

            r.setLastReportedMergedOverrideConfiguration(mergedOverrideConfiguration);



            app.thread.scheduleLaunchActivity(new Intent(r.intent), r.appToken,

                    System.identityHashCode(r), r.info,

                    new Configuration(mService.getGlobalConfiguration()),

                    new Configuration(task.getMergedOverrideConfiguration()), r.compat,

                    globalConfiguration,

                    mergedOverrideConfiguration, r.compat,

                    r.launchedFromPackage, task.voiceInteractor, app.repProcState, r.icicle,

                    r.persistentState, results, newIntents, !andResume,

                    mService.isNextTransitionForward(), profilerInfo);
@@ -1731,7 +1739,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
            // We'll update with whatever configuration it now says

            // it used to launch.

            if (config != null) {

                r.setLastReportedConfiguration(config);

                r.setLastReportedGlobalConfiguration(config);

            }



            // We are now idle.  If someone is waiting for a thumbnail from

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

+4 −3
Original line number Diff line number Diff line
@@ -1151,12 +1151,13 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
     */

    @Override

    int getOrientation() {

        if (hidden || hiddenRequested) {

            return SCREEN_ORIENTATION_UNSET;

        }

        if (fillsParent() && (isVisible() || mService.mOpeningApps.contains(this))) {

            return mOrientation;

        }



        return SCREEN_ORIENTATION_UNSET;

    }



    /** Returns the app's preferred orientation regardless of its currently visibility state. */

    int getOrientationIgnoreVisibility() {

        return mOrientation;

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

+4 −5
Original line number Diff line number Diff line
@@ -510,14 +510,13 @@ class WindowContainer<E extends WindowContainer> implements Comparable<WindowCon 
     * specification...

     */

    int getOrientation() {



        if (!fillsParent() || !isVisible()) {

            // Ignore invisible containers or containers that don't completely fills their parents.

        if (!fillsParent()) {

            // Ignore containers that don't completely fills their parents.

            return SCREEN_ORIENTATION_UNSET;

        }



        // The container fills its parent so we can use it orientation if it has one specified,

        // otherwise we prefer to use the orientation of its topmost child that has one

        // The container fills its parent and is visible so we can use it orientation if it has one

        // specified; otherwise we prefer to use the orientation of its topmost child that has one

        // specified and fall back on this container's unset or unspecified value as a candidate

        // if none of the children have a better candidate for the orientation.

        if (mOrientation != SCREEN_ORIENTATION_UNSET

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

+9 −0
Original line number Diff line number Diff line
@@ -2441,6 +2441,15 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    /**

     * Updates the device orientation from the present app tokens.

     *

     * Note: A place this is method called is before an {@link android.app.Activity} starts to

     * ensure that it is created in the proper orientation. It is imperative that the present

     * {@link AppWindowToken} specify that they can influence the orientation, accomplished with the

     * override of {@link WindowContainer#canSpecifyOrientation()}. Visibility changes only will not

     * guarantee this as other operations (such as freezing the screen) can defer these operations.

     */

    @Override

    public Configuration updateOrientationFromAppTokens(Configuration currentConfig,

            IBinder freezeThisOneIfNeeded, int displayId) {