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

Merge changes from topic "presubmit-am-9a89763689094e51b347f585fe1f995d" into tm-mainline-prod

Browse Source 
* changes:
  [automerge] Fix crash when unfolding a device. 2p: 9af4098658
  Fix crash when unfolding a device.
This commit is contained in:
TreeHugger Robot
2022-04-09 08:52:55 +00:00
committed by Android (Google) Code Review
parent 149765a1f5 1240b4771f
commit 0e972ac3c7
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java
View File

@@ -200,12 +200,23 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent {
rotateRectToDisplayRotation(displayId, featureRect);
transformToWindowSpaceRect(activity, featureRect);
features.add(new FoldingFeature(featureRect, baseFeature.getType(), state));
if (!isRectZero(featureRect)) {
// TODO(b/228641877) Remove guarding if when fixed.
features.add(new FoldingFeature(featureRect, baseFeature.getType(), state));
}
}
}
return features;
}
/**
* Returns {@link true} if a {@link Rect} has zero width and zero height,
* {@code false} otherwise.
*/
private boolean isRectZero(Rect rect) {
return rect.width() == 0 && rect.height() == 0;
}
private final class NotifyOnConfigurationChanged extends EmptyLifecycleCallbacksAdapter {
@Override
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {