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

2021-09-08 02:14:31 +00:00
parent f6542d4e64 bfac46a30c
commit 11438429a8
1 changed files with 5 additions and 3 deletions
@@ -600,9 +600,11 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche

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