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

Merge "Log NPE in QSAnimator" into tm-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2022-03-15 13:51:35 +00:00
committed by Android (Google) Code Review
parent 76473a4ebf f95803f19d
commit 5e30ed8b64
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
View File

@@ -241,7 +241,13 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
private void addNonFirstPageAnimators(int page) {
Pair<HeightExpansionAnimator, TouchAnimator> pair = createSecondaryPageAnimators(page);
mNonFirstPageQSAnimators.put(page, pair);
if (pair != null) {
// pair is null in one of two cases:
// * mPagedTileLayout is null, meaning we are still setting up.
// * the page has no tiles
// In either case, don't add the animators to the map.
mNonFirstPageQSAnimators.put(page, pair);
}
}
@Override
@@ -518,6 +524,13 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
SideLabelTileLayout qqsLayout = (SideLabelTileLayout) mQuickQsPanel.getTileLayout();
View view = mQs.getView();
List<String> specs = mPagedLayout.getSpecsForPage(page);
if (specs.isEmpty()) {
// specs should not be empty in a valid secondary page, as we scrolled to it.
// We may crash later on because there's a null animator.
specs = mQsPanelController.getHost().mTileSpecs;
Log.e(TAG, "Trying to create animators for empty page " + page + ". Tiles: " + specs);
// return null;
}
int row = -1;
int lastTileTop = -1;