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

Merge "Fix NPE when leaving kids mode" into tm-qpr-dev

Browse Source
This commit is contained in:
Shawn Lin
2022-08-26 01:56:55 +00:00
committed by Android (Google) Code Review
parent 230a7287bc e01635e68f
commit ef35f3a638
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java
View File

@@ -316,12 +316,14 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
true /* onTop */); true /* onTop */);
wct.reorder(rootToken, mEnabled /* onTop */); wct.reorder(rootToken, mEnabled /* onTop */);
mSyncQueue.queue(wct); mSyncQueue.queue(wct);
if (mEnabled) {
final SurfaceControl rootLeash = mLaunchRootLeash; final SurfaceControl rootLeash = mLaunchRootLeash;
mSyncQueue.runInSync(t -> { mSyncQueue.runInSync(t -> {
t.setPosition(rootLeash, taskBounds.left, taskBounds.top); t.setPosition(rootLeash, taskBounds.left, taskBounds.top);
t.setWindowCrop(rootLeash, taskBounds.width(), taskBounds.height()); t.setWindowCrop(rootLeash, taskBounds.width(), taskBounds.height());
}); });
} }
}
private Rect calculateBounds() { private Rect calculateBounds() {
final Rect bounds = new Rect(0, 0, mDisplayWidth, mDisplayHeight); final Rect bounds = new Rect(0, 0, mDisplayWidth, mDisplayHeight);