Merge "Fix SecondaryDisplayLauncher crash by initializing OnBoardingPrefs after initializing UI" into tm-qpr-dev am: 2d82ad2664
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19818710 Change-Id: I2a9a2dac0dbbe3e9ce233106c168b6648e864ffe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -73,11 +73,11 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
mModel = LauncherAppState.getInstance(this).getModel();
|
||||
mOnboardingPrefs = new OnboardingPrefs<>(this, Utilities.getPrefs(this));
|
||||
mSecondaryDisplayPredictions = SecondaryDisplayPredictions.newInstance(this);
|
||||
if (getWindow().getDecorView().isAttachedToWindow()) {
|
||||
initUi();
|
||||
}
|
||||
mOnboardingPrefs = new OnboardingPrefs<>(this, Utilities.getPrefs(this));
|
||||
mSecondaryDisplayPredictions = SecondaryDisplayPredictions.newInstance(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user