Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11438429 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents f6542d4e bfac46a3

src/com/android/launcher3/Launcher.java

+5 −3
Original line number Diff line number Diff line
@@ -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);