Merge "Report bounds instead of size in WindowMetrics" into rvc-dev
diff --git a/service/src/com/android/car/pm/ActivityBlockingActivity.java b/service/src/com/android/car/pm/ActivityBlockingActivity.java
index 293b278..a054d2d 100644
--- a/service/src/com/android/car/pm/ActivityBlockingActivity.java
+++ b/service/src/com/android/car/pm/ActivityBlockingActivity.java
@@ -40,7 +40,6 @@
import android.os.RemoteException;
import android.text.TextUtils;
import android.util.Log;
-import android.util.Size;
import android.view.Display;
import android.view.DisplayInfo;
import android.view.View;
@@ -229,12 +228,12 @@
.getWindowInsets()
.getInsets(WindowInsets.Type.systemBars());
- Size displaySize = getWindowManager().getCurrentWindowMetrics().getSize();
+ Rect displayBounds = getWindowManager().getCurrentWindowMetrics().getBounds();
int leftX = systemBarInsets.left;
- int rightX = displaySize.getWidth() - systemBarInsets.right;
+ int rightX = displayBounds.width() - systemBarInsets.right;
int topY = systemBarInsets.top;
- int bottomY = displaySize.getHeight() - systemBarInsets.bottom;
+ int bottomY = displayBounds.height() - systemBarInsets.bottom;
return new Rect(leftX, topY, rightX, bottomY);
}