Remove reflection from DisplayCutoutController.

The P SDK is available for direct use now.

Bug: 1095714
Change-Id: I0357d8c5060871895dbf4a080cf71778e3a867bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2296892Reviewed-by: Becca Hughes <beccahughes@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789099}

chrome/android/java/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutController.java

@@ -4,8 +4,10 @@
 
 package org.chromium.chrome.browser.display_cutout;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.graphics.Rect;
+import android.os.Build;
 import android.view.Window;
 import android.view.WindowManager.LayoutParams;
 
@@ -14,7 +16,6 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.UserData;
 import org.chromium.base.UserDataHost;
-import org.chromium.base.annotations.JNINamespace;
 import org.chromium.blink.mojom.ViewportFit;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
@@ -29,13 +30,7 @@ import org.chromium.ui.base.WindowAndroid;
 /**
  * Controls the display cutout state for the tab.
  */
-@JNINamespace("chrome")
 public class DisplayCutoutController implements InsetObserverView.WindowInsetObserver, UserData {
-    /** These are the property names of the different cutout mode states. */
-    private static final String VIEWPORT_FIT_AUTO = "LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT";
-    private static final String VIEWPORT_FIT_CONTAIN = "LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER";
-    private static final String VIEWPORT_FIT_COVER = "LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES";
-
     private static final Class<DisplayCutoutController> USER_DATA_KEY =
             DisplayCutoutController.class;
 
@@ -188,49 +183,42 @@ public class DisplayCutoutController implements InsetObserverView.WindowInsetObs
      *     equivalent value.
      */
     @VisibleForTesting
-    protected String getDisplayCutoutMode() {
+    @TargetApi(Build.VERSION_CODES.P)
+    protected int getDisplayCutoutMode() {
         // If we are not interactable then force the default mode.
-        if (!mTab.isUserInteractable()) return VIEWPORT_FIT_AUTO;
+        if (!mTab.isUserInteractable()) {
+            return LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT;
+        }
 
         switch (mViewportFit) {
             case ViewportFit.CONTAIN:
-                return VIEWPORT_FIT_CONTAIN;
+                return LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER;
             case ViewportFit.COVER_FORCED_BY_USER_AGENT:
             case ViewportFit.COVER:
-                return VIEWPORT_FIT_COVER;
+                return LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
             case ViewportFit.AUTO:
             default:
-                return VIEWPORT_FIT_AUTO;
+                return LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT;
         }
     }
 
     @VisibleForTesting
-    protected Object getWindowAttributes() {
+    protected LayoutParams getWindowAttributes() {
         return mWindow.getAttributes();
     }
 
     @VisibleForTesting
-    protected void setWindowAttributes(Object attributes) {
-        mWindow.setAttributes((LayoutParams) attributes);
+    protected void setWindowAttributes(LayoutParams attributes) {
+        mWindow.setAttributes(attributes);
     }
 
     /** Updates the layout based on internal state. */
     @VisibleForTesting
     protected void maybeUpdateLayout() {
-        try {
-            Object attributes = getWindowAttributes();
-
-            int layoutValue =
-                    attributes.getClass().getDeclaredField(getDisplayCutoutMode()).getInt(null);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
 
-            attributes.getClass()
-                    .getDeclaredField("layoutInDisplayCutoutMode")
-                    .setInt(attributes, layoutValue);
-
-            setWindowAttributes(attributes);
-        } catch (Exception ex) {
-            // API is not available.
-            return;
-        }
+        LayoutParams attributes = getWindowAttributes();
+        attributes.layoutInDisplayCutoutMode = getDisplayCutoutMode();
+        setWindowAttributes(attributes);
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutTest.java

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.display_cutout;
 
 import android.os.Build;
+import android.view.WindowManager;
 
 import androidx.test.filters.LargeTest;
 
@@ -13,6 +14,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.blink.mojom.ViewportFit;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -25,6 +27,7 @@ import java.util.concurrent.TimeoutException;
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
+@MinAndroidSdkLevel(Build.VERSION_CODES.P)
 public class DisplayCutoutTest {
     @Rule
     public DisplayCutoutTestRule mTestRule =
@@ -36,15 +39,12 @@ public class DisplayCutoutTest {
     @Test
     @LargeTest
     public void testViewportFitAuto() throws TimeoutException {
-        // Display Cutout API requires Android P+.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
-
         mTestRule.enterFullscreen();
         mTestRule.setViewportFit(DisplayCutoutTestRule.VIEWPORT_FIT_AUTO);
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
     }
 
     /**
@@ -53,15 +53,12 @@ public class DisplayCutoutTest {
     @Test
     @LargeTest
     public void testViewportFitContain() throws TimeoutException {
-        // Display Cutout API requires Android P+.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
-
         mTestRule.enterFullscreen();
         mTestRule.setViewportFit(DisplayCutoutTestRule.VIEWPORT_FIT_CONTAIN);
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER);
     }
 
     /**
@@ -70,21 +67,18 @@ public class DisplayCutoutTest {
     @Test
     @LargeTest
     public void testViewportFitCover() throws TimeoutException {
-        // Display Cutout API requires Android P+.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
-
         mTestRule.enterFullscreen();
         mTestRule.setViewportFit(DisplayCutoutTestRule.VIEWPORT_FIT_COVER);
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITH_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
 
         mTestRule.exitFullscreen();
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
     }
 
     /**
@@ -93,9 +87,6 @@ public class DisplayCutoutTest {
     @Test
     @LargeTest
     public void testViewportFitCoverForced() throws TimeoutException {
-        // Display Cutout API requires Android P+.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
-
         mTestRule.enterFullscreen();
 
         // Set the viewport fit internally as this value is internal only.
@@ -103,13 +94,13 @@ public class DisplayCutoutTest {
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITH_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
 
         mTestRule.exitFullscreen();
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
     }
 
     /**
@@ -118,20 +109,17 @@ public class DisplayCutoutTest {
     @Test
     @LargeTest
     public void testViewportFitDefault() throws TimeoutException {
-        // Display Cutout API requires Android P+.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
-
         mTestRule.enterFullscreen();
         mTestRule.setViewportFit(DisplayCutoutTestRule.VIEWPORT_FIT_COVER);
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITH_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
 
         mTestRule.setViewportFit("");
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
     }
 
     /**
@@ -140,16 +128,13 @@ public class DisplayCutoutTest {
     @Test
     @LargeTest
     public void testViewportFitDipScale() throws TimeoutException {
-        // Display Cutout API requires Android P+.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
-
         mTestRule.enterFullscreen();
         mTestRule.setDipScale(DisplayCutoutTestRule.TEST_HIGH_DIP_SCALE);
         mTestRule.setViewportFit(DisplayCutoutTestRule.VIEWPORT_FIT_COVER);
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITH_CUTOUT_HIGH_DIP);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
     }
 
     /**
@@ -158,16 +143,13 @@ public class DisplayCutoutTest {
     @Test
     @LargeTest
     public void testViewportFitSubframe() throws TimeoutException {
-        // Display Cutout API requires Android P+.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
-
         mTestRule.enterFullscreen();
         mTestRule.setViewportFit(DisplayCutoutTestRule.VIEWPORT_FIT_CONTAIN);
 
         mTestRule.enterFullscreenOnSubframe();
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
         mTestRule.waitForSafeAreaOnSubframe(DisplayCutoutTestRule.TEST_SAFE_AREA_WITH_CUTOUT);
     }
 
@@ -177,15 +159,12 @@ public class DisplayCutoutTest {
     @Test
     @LargeTest
     public void testViewportFitCoverNoCutout() throws TimeoutException {
-        // Display Cutout API requires Android P+.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return;
-
         mTestRule.setDeviceHasCutout(false);
         mTestRule.enterFullscreen();
         mTestRule.setViewportFit(DisplayCutoutTestRule.VIEWPORT_FIT_COVER);
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutTestRule.java

@@ -4,8 +4,11 @@
 
 package org.chromium.chrome.browser.display_cutout;
 
+import android.annotation.TargetApi;
 import android.graphics.Rect;
+import android.os.Build;
 import android.support.test.InstrumentationRegistry;
+import android.view.WindowManager.LayoutParams;
 
 import org.hamcrest.Matchers;
 import org.json.JSONException;
@@ -14,7 +17,6 @@ import org.junit.Assert;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import org.chromium.base.annotations.UsedByReflection;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.fullscreen.FullscreenOptions;
@@ -37,6 +39,7 @@ import java.util.concurrent.TimeoutException;
  *
  * @param <T> The type of {@link ChromeActivity} to use for the test.
  */
+@TargetApi(Build.VERSION_CODES.P)
 public class DisplayCutoutTestRule<T extends ChromeActivity> extends ChromeActivityTestRule<T> {
     /** These are the two test safe areas with and without the test cutout. */
     public static final Rect TEST_SAFE_AREA_WITH_CUTOUT = new Rect(10, 20, 30, 40);
@@ -51,26 +54,9 @@ public class DisplayCutoutTestRule<T extends ChromeActivity> extends ChromeActiv
     public static final String VIEWPORT_FIT_CONTAIN = "contain";
     public static final String VIEWPORT_FIT_COVER = "cover";
 
-    /** This simulates the Android P+ {@link LayoutParams}. */
-    public static final class LayoutParamsApi28 {
-        @UsedByReflection("Display Cutout Controller")
-        public static final int LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT = 0;
-
-        @UsedByReflection("Display Cutout Controller")
-        public static final int LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER = 1;
-
-        @UsedByReflection("Display Cutout Controller")
-        public static final int LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES = 2;
-
-        // This tells the Android system whether to extend into the display cutout area.
-        @UsedByReflection("Display Cutout Controller")
-        public int layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT;
-    }
-
     /** This class has polyfills for Android P+ system apis. */
     private static final class TestDisplayCutoutController extends DisplayCutoutController {
         private boolean mDeviceHasCutout = true;
-        private LayoutParamsApi28 mLayoutParams = new LayoutParamsApi28();
         private float mDipScale = 1;
 
         TestDisplayCutoutController(Tab tab) {
@@ -78,17 +64,12 @@ public class DisplayCutoutTestRule<T extends ChromeActivity> extends ChromeActiv
         }
 
         @Override
-        protected Object getWindowAttributes() {
-            return mLayoutParams;
-        }
-
-        @Override
-        protected void setWindowAttributes(Object attributes) {
-            mLayoutParams = (LayoutParamsApi28) attributes;
+        protected void setWindowAttributes(LayoutParams attributes) {
+            super.setWindowAttributes(attributes);
 
             // Apply insets based on new layout mode.
             if (getLayoutInDisplayCutoutMode()
-                            == LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+                            == LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
                     && mDeviceHasCutout) {
                 onSafeAreaChanged(TEST_SAFE_AREA_WITH_CUTOUT);
             } else {
@@ -97,7 +78,7 @@ public class DisplayCutoutTestRule<T extends ChromeActivity> extends ChromeActiv
         }
 
         public int getLayoutInDisplayCutoutMode() {
-            return mLayoutParams.layoutInDisplayCutoutMode;
+            return getWindowAttributes().layoutInDisplayCutoutMode;
         }
 
         @Override

chrome/android/javatests/src/org/chromium/chrome/browser/display_cutout/WebappDisplayCutoutTest.java

@@ -4,6 +4,9 @@
 
 package org.chromium.chrome.browser.display_cutout;
 
+import android.os.Build;
+import android.view.WindowManager;
+
 import androidx.test.filters.LargeTest;
 
 import org.junit.Rule;
@@ -12,6 +15,7 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.FlakyTest;
+import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.webapps.WebDisplayMode;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
@@ -23,6 +27,7 @@ import java.util.concurrent.TimeoutException;
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
+@MinAndroidSdkLevel(Build.VERSION_CODES.P)
 public class WebappDisplayCutoutTest {
     @Rule
     public WebappDisplayCutoutTestRule mTestRule = new WebappDisplayCutoutTestRule();
@@ -39,7 +44,7 @@ public class WebappDisplayCutoutTest {
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
     }
 
     /**
@@ -54,7 +59,7 @@ public class WebappDisplayCutoutTest {
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITH_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
     }
 
     /**
@@ -70,7 +75,7 @@ public class WebappDisplayCutoutTest {
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
     }
 
     /**
@@ -86,6 +91,6 @@ public class WebappDisplayCutoutTest {
 
         mTestRule.waitForSafeArea(DisplayCutoutTestRule.TEST_SAFE_AREA_WITHOUT_CUTOUT);
         mTestRule.waitForLayoutInDisplayCutoutMode(
-                DisplayCutoutTestRule.LayoutParamsApi28.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT);
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/display_cutout/WebappDisplayCutoutTestRule.java

@@ -4,8 +4,10 @@
 
 package org.chromium.chrome.browser.display_cutout;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.support.test.InstrumentationRegistry;
 
 import org.hamcrest.Matchers;
@@ -26,13 +28,14 @@ import java.lang.annotation.Target;
 /**
  * Custom test rule for simulating a {@link WebappActivity} with a Display Cutout.
  */
+@TargetApi(Build.VERSION_CODES.P)
 public class WebappDisplayCutoutTestRule extends DisplayCutoutTestRule<WebappActivity> {
     /** Test data for the test webapp. */
     private static final String WEBAPP_ID = "webapp_id";
     private static final String WEBAPP_NAME = "webapp name";
     private static final String WEBAPP_SHORT_NAME = "webapp short name";
 
-    /** The maximum waiting time to start {@link WebActivity0} in ms. */
+    /** The maximum waiting time to start {@link WebActivity} in ms. */
     private static final long STARTUP_TIMEOUT = 10000L;
 
     /**

chrome/android/junit/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutControllerTest.java

@@ -13,6 +13,7 @@ import static org.mockito.Mockito.when;
 import android.app.Activity;
 import android.support.test.filters.SmallTest;
 import android.view.Window;
+import android.view.WindowManager.LayoutParams;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -72,6 +73,7 @@ public class DisplayCutoutControllerTest {
         // Mock dependency on InsetObserverView.
 
         when(mChromeActivity.getWindow()).thenReturn(mWindow);
+        when(mWindow.getAttributes()).thenReturn(new LayoutParams());
         when(mTab.getWindowAndroid()).thenReturn(mWindowAndroid);
         when(mWindowAndroid.getActivity()).thenReturn(mActivityRef);
         when(mChromeActivity.getInsetObserverView()).thenReturn(mInsetObserver);
@@ -103,7 +105,7 @@ public class DisplayCutoutControllerTest {
         when(mTab.isUserInteractable()).thenReturn(true);
 
         mDisplayCutoutController.setViewportFit(ViewportFit.AUTO);
-        Assert.assertEquals("LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT",
+        Assert.assertEquals(LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT,
                 mDisplayCutoutController.getDisplayCutoutMode());
     }
 
@@ -113,7 +115,7 @@ public class DisplayCutoutControllerTest {
         when(mTab.isUserInteractable()).thenReturn(true);
 
         mDisplayCutoutController.setViewportFit(ViewportFit.COVER);
-        Assert.assertEquals("LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES",
+        Assert.assertEquals(LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES,
                 mDisplayCutoutController.getDisplayCutoutMode());
     }
 
@@ -123,7 +125,7 @@ public class DisplayCutoutControllerTest {
         when(mTab.isUserInteractable()).thenReturn(true);
 
         mDisplayCutoutController.setViewportFit(ViewportFit.COVER_FORCED_BY_USER_AGENT);
-        Assert.assertEquals("LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES",
+        Assert.assertEquals(LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES,
                 mDisplayCutoutController.getDisplayCutoutMode());
     }
 
@@ -133,7 +135,7 @@ public class DisplayCutoutControllerTest {
         when(mTab.isUserInteractable()).thenReturn(true);
 
         mDisplayCutoutController.setViewportFit(ViewportFit.CONTAIN);
-        Assert.assertEquals("LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER",
+        Assert.assertEquals(LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER,
                 mDisplayCutoutController.getDisplayCutoutMode());
     }
 
@@ -141,7 +143,7 @@ public class DisplayCutoutControllerTest {
     @SmallTest
     public void testCutoutModeWhenAutoAndNotInteractable() {
         mDisplayCutoutController.setViewportFit(ViewportFit.AUTO);
-        Assert.assertEquals("LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT",
+        Assert.assertEquals(LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT,
                 mDisplayCutoutController.getDisplayCutoutMode());
     }
 
@@ -149,7 +151,7 @@ public class DisplayCutoutControllerTest {
     @SmallTest
     public void testCutoutModeWhenCoverAndNotInteractable() {
         mDisplayCutoutController.setViewportFit(ViewportFit.COVER);
-        Assert.assertEquals("LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT",
+        Assert.assertEquals(LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT,
                 mDisplayCutoutController.getDisplayCutoutMode());
     }
 
@@ -157,7 +159,7 @@ public class DisplayCutoutControllerTest {
     @SmallTest
     public void testCutoutModeWhenCoverForcedAndNotInteractable() {
         mDisplayCutoutController.setViewportFit(ViewportFit.COVER_FORCED_BY_USER_AGENT);
-        Assert.assertEquals("LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT",
+        Assert.assertEquals(LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT,
                 mDisplayCutoutController.getDisplayCutoutMode());
     }
 
@@ -165,7 +167,7 @@ public class DisplayCutoutControllerTest {
     @SmallTest
     public void testCutoutModeWhenContainAndNotInteractable() {
         mDisplayCutoutController.setViewportFit(ViewportFit.CONTAIN);
-        Assert.assertEquals("LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT",
+        Assert.assertEquals(LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT,
                 mDisplayCutoutController.getDisplayCutoutMode());
     }