commit 11438429a88734a5700dbe81a7786b9a69ac9514
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 08 02:14:31 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 08 02:14:31 2021 +0000
tree 0ddf074d8bcd376c274c19d27a0f32106c62dcb5
parent f6542d4e64b949c5a27563c39a31d3e07e77fae3
parent bfac46a30c659d3033070e680d6e1b3a4eef359f

Merge "Prevent NPE when init device profile" into sc-v2-dev

src/com/android/launcher3/Launcher.java

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);