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

Commit 46e74506 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Query default display size from display manager 

The current Android API will trigger strict mode
violations in case a context not bound to any
particular display tries to connect to the window
manager service.
To avoid such violations query the default display size
directly from the display manager.

Bug: 157167435
Test: Camera CTS
Change-Id: Icad19ec0227b4945da9e6fcacaec916c5799877f
parent 1c65357c

core/java/android/hardware/camera2/CameraManager.java

+15 −12
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.hardware.camera2.legacy.LegacyMetadataMapper; 
import android.hardware.camera2.params.SessionConfiguration;

import android.hardware.camera2.utils.CameraIdAndSessionConfiguration;

import android.hardware.camera2.utils.ConcurrentCameraIdCombination;

import android.hardware.display.DisplayManager;

import android.os.Binder;

import android.os.DeadObjectException;

import android.os.Handler;
@@ -47,7 +48,6 @@ import android.util.ArraySet; 
import android.util.Log;

import android.util.Size;

import android.view.Display;

import android.view.WindowManager;



import java.util.ArrayList;

import java.util.Arrays;
@@ -334,10 +334,10 @@ public final class CameraManager { 
        Size ret = new Size(0, 0);



        try {

            WindowManager windowManager =

                    (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);

            Display display = windowManager.getDefaultDisplay();



            DisplayManager displayManager =

                    (DisplayManager) mContext.getSystemService(Context.DISPLAY_SERVICE);

            Display display = displayManager.getDisplay(Display.DEFAULT_DISPLAY);

            if (display != null) {

                int width = display.getWidth();

                int height = display.getHeight();
@@ -347,6 +347,9 @@ public final class CameraManager { 
                }



                ret = new Size(width, height);

            } else {

                Log.e(TAG, "Invalid default display!");

            }

        } catch (Exception e) {

            Log.e(TAG, "getDisplaySize Failed. " + e.toString());

        }