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

Commit f7e4ccd2 authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "Fix cts ApplicationTest#testApplication failing."

parents 2ee825f5 01c2133b

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

+5 −3
Original line number Diff line number Diff line
@@ -4397,8 +4397,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
            if (r == null) {

                return;

            }

            if (r.task != null && r.task.mResizeable) {

                // Fixed screen orientation isn't supported with resizeable activities.

            TaskRecord task = r.task;

            if (task != null && (!task.mFullscreen || !task.stack.mFullscreen)) {

                // Fixed screen orientation isn't supported when activities aren't in full screen

                // mode.

                return;

            }

            final long origId = Binder.clearCallingIdentity();
@@ -17759,7 +17761,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
     * @param userId is only used when persistent parameter is set to true to persist configuration

     *               for that particular user

     */

    boolean updateConfigurationLocked(Configuration values,

    private boolean updateConfigurationLocked(Configuration values,

            ActivityRecord starting, boolean initLocale, boolean persistent, int userId) {

        int changes = 0;