Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix notification permission for letterboxed activity" into tm-qpr-dev

Browse Source
This commit is contained in:
Massimo Carli
2023-01-13 16:29:16 +00:00
committed by Android (Google) Code Review
parent bc907f456f 9913118662
commit bab869ca8c
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/LetterboxUiController.java
View File

@@ -1146,10 +1146,9 @@ final class LetterboxUiController {
final ActivityRecord firstOpaqueActivityBeneath = mActivityRecord.getTask().getActivity( final ActivityRecord firstOpaqueActivityBeneath = mActivityRecord.getTask().getActivity(
ActivityRecord::fillsParent, mActivityRecord, false /* includeBoundary */, ActivityRecord::fillsParent, mActivityRecord, false /* includeBoundary */,
true /* traverseTopToBottom */); true /* traverseTopToBottom */);
if (firstOpaqueActivityBeneath == null if (firstOpaqueActivityBeneath == null) {
|| mActivityRecord.launchedFromUid != firstOpaqueActivityBeneath.getUid()) {
// We skip letterboxing if the translucent activity doesn't have any opaque // We skip letterboxing if the translucent activity doesn't have any opaque
// activities beneath of if it's launched from a different user (e.g. notification) // activities beneath
return; return;
} }
inheritConfiguration(firstOpaqueActivityBeneath); inheritConfiguration(firstOpaqueActivityBeneath);

21
services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
View File

@@ -196,27 +196,6 @@ public class SizeCompatTests extends WindowTestsBase {
assertEquals(1.5f, translucentActivity.getMaxAspectRatio(), 0.00001f); assertEquals(1.5f, translucentActivity.getMaxAspectRatio(), 0.00001f);
} }
@Test
public void testNotApplyStrategyToTranslucentActivitiesWithDifferentUid() {
mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
setUpDisplaySizeWithApp(2000, 1000);
prepareUnresizable(mActivity, 1.5f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT);
mActivity.info.setMinAspectRatio(1.2f);
mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
// Translucent Activity
final ActivityRecord translucentActivity = new ActivityBuilder(mAtm)
.setScreenOrientation(SCREEN_ORIENTATION_LANDSCAPE)
.setMinAspectRatio(1.1f)
.setMaxAspectRatio(3f)
.build();
doReturn(false).when(translucentActivity).fillsParent();
mTask.addChild(translucentActivity);
// We check bounds
final Rect opaqueBounds = mActivity.getConfiguration().windowConfiguration.getBounds();
final Rect translucentRequestedBounds = translucentActivity.getRequestedOverrideBounds();
assertNotEquals(opaqueBounds, translucentRequestedBounds);
}
@Test @Test
public void testApplyStrategyToMultipleTranslucentActivities() { public void testApplyStrategyToMultipleTranslucentActivities() {
mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true); mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);