| commit | 68e7b1a3155cf2ebb602891279b8a01483fe82c7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 08 02:30:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 08 02:30:42 2021 +0000 |
| tree | 740958e3ab08dd764db929591d3db97c5b8e4bec | |
| parent | 8788f72cdf12ecb1569050862fc29664578cb622 [diff] | |
| parent | 11438429a88734a5700dbe81a7786b9a69ac9514 [diff] |
Merge "Prevent NPE when init device profile" into sc-v2-dev am: 11438429a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15781507 Change-Id: I3c5b65e287325b6176759bb9ff5f03fee9ad282c
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 1354a7a..8e1a09c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java
@@ -600,9 +600,11 @@ private void initDeviceProfile(InvariantDeviceProfile idp) { // Load configuration-specific DeviceProfile - mDeviceProfile = isInMultiWindowMode() - ? mDeviceProfile.getMultiWindowProfile(this, getMultiWindowDisplaySize()) - : idp.getDeviceProfile(this); + mDeviceProfile = idp.getDeviceProfile(this); + if (isInMultiWindowMode()) { + mDeviceProfile = mDeviceProfile.getMultiWindowProfile( + this, getMultiWindowDisplaySize()); + } onDeviceProfileInitiated(); mModelWriter = mModel.getWriter(getDeviceProfile().isVerticalBarLayout(), true, this);