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

Commit 7aea9d95 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Stop ignoring app's requested orientation on Auto."

parents 3e3a1365 8b5d67d1

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

+0 −12
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ import android.annotation.CallSuper; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.pm.PackageManager;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.graphics.Bitmap;
@@ -4419,17 +4418,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            }



            final int orientation = super.getOrientation();

            boolean isCar = mWmService.mContext.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_AUTOMOTIVE);

            if (isCar) {

                // In a car, you cannot physically rotate the screen, so it doesn't make sense to

                // allow anything but the default orientation.

                if (DEBUG_ORIENTATION) Slog.v(TAG_WM,

                        "Forcing UNSPECIFIED orientation in car for display id=" + mDisplayId

                                + ". Ignoring " + orientation);

                return SCREEN_ORIENTATION_UNSPECIFIED;

            }



            if (orientation != SCREEN_ORIENTATION_UNSET

                    && orientation != SCREEN_ORIENTATION_BEHIND) {

                if (DEBUG_ORIENTATION) Slog.v(TAG_WM,