commit 79d1135cb8913dbbb4e87e2d324394e830fc8165
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 17 15:51:07 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 17 15:51:07 2023 +0000
tree de2a3e8076a649ef5a59154ff65e8a6952ca454f
parent e17d89baec9a19a5f379e7bb09281e77f5f6a3d7
parent 37d8b3a79840d66d87763d44bdb320c9e674218e

Merge "Flag caller identity changes in DPMS" into udc-dev

core/java/android/app/NotificationManager.java

diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index 82adaaf..4330831 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -1365,7 +1365,7 @@
     }
 
     /**
-     * Returns whether notifications from the calling package are blocked.
+     * Returns whether notifications from the calling package are enabled.
      */
     public boolean areNotificationsEnabled() {
         INotificationManager service = getService();

services/core/java/com/android/server/wm/LetterboxUiController.java

diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java
index 5a481f4..e343768 100644
--- a/services/core/java/com/android/server/wm/LetterboxUiController.java
+++ b/services/core/java/com/android/server/wm/LetterboxUiController.java
@@ -962,8 +962,8 @@
                 && (parentConfiguration.orientation == ORIENTATION_LANDSCAPE
                         && mActivityRecord.getOrientationForReachability() == ORIENTATION_PORTRAIT)
                 // Check whether the activity fills the parent vertically.
-                && parentConfiguration.windowConfiguration.getBounds().height()
-                        == mActivityRecord.getBounds().height();
+                && parentConfiguration.windowConfiguration.getAppBounds().height()
+                        <= mActivityRecord.getBounds().height();
     }
 
     @VisibleForTesting