android: Use DisplayAndroid in media

Bug: 1042063
Change-Id: I8b61a7ccdbf50703115a0e6b971a02623771756d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019603Reviewed-by: Yuri Wiitala <miu@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736028}

media/DEPS

@@ -19,6 +19,7 @@ include_rules = [
   "+third_party/libyuv",
   "+third_party/opus",
   "+third_party/skia",
+  "+ui/android",
   "+ui/display",
   "+ui/events",
   "+ui/gfx",

media/capture/content/android/BUILD.gn

@@ -37,6 +37,7 @@ android_library("screen_capture_java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
+    "//ui/android:ui_java",
   ]
   sources = [ "java/src/org/chromium/media/ScreenCapture.java" ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

media/capture/content/android/java/src/org/chromium/media/ScreenCapture.java

@@ -25,7 +25,6 @@ import android.os.HandlerThread;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.Surface;
-import android.view.WindowManager;
 
 import androidx.annotation.IntDef;
 
@@ -35,6 +34,7 @@ import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
+import org.chromium.ui.display.DisplayAndroidManager;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -238,10 +238,8 @@ public class ScreenCapture extends Fragment {
             return false;
         }
 
-        WindowManager windowManager =
-                (WindowManager) ContextUtils.getApplicationContext().getSystemService(
-                        Context.WINDOW_SERVICE);
-        mDisplay = windowManager.getDefaultDisplay();
+        mDisplay = DisplayAndroidManager.getDefaultDisplayForContext(
+                ContextUtils.getApplicationContext());
 
         DisplayMetrics metrics = new DisplayMetrics();
         mDisplay.getMetrics(metrics);

media/capture/video/android/BUILD.gn

@@ -53,6 +53,7 @@ android_library("capture_java") {
     "//base:base_java",
     "//base:jni_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//ui/android:ui_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 

media/capture/video/android/java/src/org/chromium/media/VideoCapture.java

@@ -4,15 +4,13 @@
 
 package org.chromium.media;
 
-import android.content.Context;
 import android.graphics.ImageFormat;
-import android.view.Surface;
-import android.view.WindowManager;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
+import org.chromium.ui.display.DisplayAndroid;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -157,25 +155,9 @@ public abstract class VideoCapture {
     }
 
     protected final int getDeviceRotation() {
-        final int orientation;
-        WindowManager wm = (WindowManager) ContextUtils.getApplicationContext().getSystemService(
-                Context.WINDOW_SERVICE);
-        switch (wm.getDefaultDisplay().getRotation()) {
-            case Surface.ROTATION_90:
-                orientation = 90;
-                break;
-            case Surface.ROTATION_180:
-                orientation = 180;
-                break;
-            case Surface.ROTATION_270:
-                orientation = 270;
-                break;
-            case Surface.ROTATION_0:
-            default:
-                orientation = 0;
-                break;
-        }
-        return orientation;
+        DisplayAndroid display =
+                DisplayAndroid.getNonMultiDisplay(ContextUtils.getApplicationContext());
+        return display.getRotationDegrees();
     }
 
     // {@link VideoCaptureJni.get().onPhotoTaken()} needs to be called back if there's any