updated v2 embedding and reverted v1 embedding flutterview

Author: jesswrd

shell/platform/android/io/flutter/embedding/android/FlutterView.java

@@ -14,6 +14,7 @@
 import android.database.ContentObserver;
 import android.graphics.Insets;
 import android.graphics.Rect;
+import android.hardware.display.DisplayManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
@@ -31,7 +32,6 @@
 import android.view.ViewGroup;
 import android.view.ViewStructure;
 import android.view.WindowInsets;
-import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.autofill.AutofillValue;
@@ -612,8 +612,8 @@ private ZeroSides calculateShouldZeroSides() {
     Context context = getContext();
     int orientation = context.getResources().getConfiguration().orientation;
     int rotation =
-        ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE))
-            .getDefaultDisplay()
+        ((DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE))
+            .getDisplay(0)
             .getRotation();
 
     if (orientation == Configuration.ORIENTATION_LANDSCAPE) {

shell/platform/android/io/flutter/view/FlutterView.java

@@ -15,7 +15,6 @@
 import android.graphics.Insets;
 import android.graphics.PixelFormat;
 import android.graphics.SurfaceTexture;
-import android.hardware.display.DisplayManager;
 import android.os.Build;
 import android.os.Handler;
 import android.text.format.DateFormat;
@@ -32,6 +31,7 @@
 import android.view.ViewConfiguration;
 import android.view.ViewStructure;
 import android.view.WindowInsets;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.autofill.AutofillValue;
@@ -537,8 +537,8 @@ private ZeroSides calculateShouldZeroSides() {
     Context context = getContext();
     int orientation = context.getResources().getConfiguration().orientation;
     int rotation =
-        ((DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE))
-            .getDisplay(0)
+        ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE))
+            .getDefaultDisplay()
             .getRotation();
 
     if (orientation == Configuration.ORIENTATION_LANDSCAPE) {