Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Query default display size from display manager" into rvc-dev am: 4586885a63 am: 78f08110bc am: 98750e577e

Browse Source 
Change-Id: I358a9130e39b7c28d8044ef84c9ba05c926a8830
This commit is contained in:
TreeHugger Robot
2020-05-21 16:41:24 +00:00
committed by Automerger Merge Worker
parent 2978f5769d 98750e577e
commit 31b149965e
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/hardware/camera2/CameraManager.java
View File

@@ -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;
@@ -349,19 +349,22 @@ 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();
int width = display.getWidth();
int height = display.getHeight();
if (height > width) {
height = width;
width = display.getHeight();
}
if (height > width) {
height = width;
width = display.getHeight();
ret = new Size(width, height);
} else {
Log.e(TAG, "Invalid default display!");
}
ret = new Size(width, height);
} catch (Exception e) {
Log.e(TAG, "getDisplaySize Failed. " + e.toString());
}