commit bfac46a30c659d3033070e680d6e1b3a4eef359f
author Jerry Chang <chenghsiuchang@google.com> Wed Sep 08 08:20:58 2021 +0800
committer Jerry Chang <chenghsiuchang@google.com> Wed Sep 08 08:34:39 2021 +0800
tree 31035cdbbec73e9eac3ce0e7f22096bc76ac8aa8
parent b9e08f5773714ce3f6d87a85509bf6c44b3a24de

Prevent NPE when init device profile

Fix: 198871283
Test: manual
Change-Id: Ie303ff4f3dc05f419e80038e41e195dc874ba40a

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 94dbe00..bb6e1cb 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);