Merge "Don't throw unsupported exception over binder call" into sc-dev am: 8e60e725e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14029449

Change-Id: I8dbb21a358bf7ae47e256c3f25b0b817dffddb76

2 files changed, 3 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index d929d50919c6..8c5470578e80 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -905,8 +905,8 @@ public class DisplayPolicy {
                         && win.mActivityRecord.fillsParent()
                         && (win.mAttrs.privateFlags & PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS) != 0
                         && attrs.getFitInsetsTypes() != 0) {
-                    throw new RuntimeException("Illegal attributes: Main activity window that isn't"
-                            + " translucent trying to fit insets: "
+                    throw new IllegalArgumentException("Illegal attributes: Main activity window"
+                            + " that isn't translucent trying to fit insets: "
                             + attrs.getFitInsetsTypes()
                             + " attrs=" + attrs);
                 }
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java
index 47cf53b621d3..c163ef152af6 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java
@@ -227,7 +227,7 @@ public class DisplayPolicyTests extends WindowTestsBase {
         assertEquals(mAppWindow, policy.getTopFullscreenOpaqueWindow());
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testMainAppWindowDisallowFitSystemWindowTypes() {
         final DisplayPolicy policy = mDisplayContent.getDisplayPolicy();
         final WindowState activity = createBaseApplicationWindow();