showingAndNotOccluded = true;
secure = true;
deviceHasKeyguard = true;
+ currentUser = UserHandle.USER_NULL;
}
boolean showing;
boolean showingAndNotOccluded;
if (mKeyguardState.systemIsReady) {
// If the system is ready, it means keyguard crashed and restarted.
mKeyguardService.onSystemReady();
+ if (mKeyguardState.currentUser != UserHandle.USER_NULL) {
+ // There has been a user switch earlier
+ mKeyguardService.setCurrentUser(mKeyguardState.currentUser);
+ }
// This is used to hide the scrim once keyguard displays.
if (mKeyguardState.interactiveState == INTERACTIVE_STATE_AWAKE) {
mKeyguardService.onStartedWakingUp();
if (mDeviceDemoModeUri.equals(uri)) {
mDeviceInDemoMode = UserManager.isDeviceInDemoMode(getContext());
if (mDeviceInDemoMode) {
- SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
- mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
+ putDeviceInDemoMode();
} else {
SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "0");
if (mWakeLock.isHeld()) {
synchronized (mActivityLock) {
mFirstUserActivityTime = mLastUserActivityTime = SystemClock.uptimeMillis();
}
- mPreloadAppsInstaller = new PreloadAppsInstaller(context);
}
private Notification createResetNotification() {
return mSystemUserConfiguration;
}
+ private void putDeviceInDemoMode() {
+ SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
+ mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
+ }
+
@Override
public void onStart() {
if (DEBUG) {
@Override
public void onBootPhase(int bootPhase) {
- if (bootPhase != PHASE_THIRD_PARTY_APPS_CAN_START) {
- return;
- }
- mPm = (PowerManager) getContext().getSystemService(Context.POWER_SERVICE);
- mAmi = LocalServices.getService(ActivityManagerInternal.class);
- mWakeLock = mPm
- .newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TAG);
- mNm = NotificationManager.from(getContext());
- mCameraManager = (CameraManager) getContext().getSystemService(Context.CAMERA_SERVICE);
- mCameraIdsWithFlash = getCameraIdsWithFlash();
-
- if (UserManager.isDeviceInDemoMode(getContext())) {
- mDeviceInDemoMode = true;
- SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
- mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
+ switch (bootPhase) {
+ case PHASE_THIRD_PARTY_APPS_CAN_START:
+ mPreloadAppsInstaller = new PreloadAppsInstaller(getContext());
+ mPm = (PowerManager) getContext().getSystemService(Context.POWER_SERVICE);
+ mAmi = LocalServices.getService(ActivityManagerInternal.class);
+ mWakeLock = mPm
+ .newWakeLock(
+ PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP,
+ TAG);
+ mNm = NotificationManager.from(getContext());
+ mCameraManager = (CameraManager) getContext()
+ .getSystemService(Context.CAMERA_SERVICE);
+ mCameraIdsWithFlash = getCameraIdsWithFlash();
+ SettingsObserver settingsObserver = new SettingsObserver(mHandler);
+ settingsObserver.register();
+ settingsObserver.refreshTimeoutConstants();
+ registerBroadcastReceiver();
+ break;
+ case PHASE_BOOT_COMPLETED:
+ if (UserManager.isDeviceInDemoMode(getContext())) {
+ mDeviceInDemoMode = true;
+ putDeviceInDemoMode();
+ }
+ break;
}
- SettingsObserver settingsObserver = new SettingsObserver(mHandler);
- settingsObserver.register();
- settingsObserver.refreshTimeoutConstants();
- registerBroadcastReceiver();
}
@Override