diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 0983e10d2965f..8b677a99b22ae 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1468,10 +1468,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0; if (mHasFeatureLeanback) { isSetupComplete &= isTvUserSetupComplete(); + } else if (mHasFeatureAuto) { + isSetupComplete &= isAutoUserSetupComplete(); } return isSetupComplete; } + private boolean isAutoUserSetupComplete() { + return Settings.Secure.getIntForUser(mContext.getContentResolver(), + "android.car.SETUP_WIZARD_IN_PROGRESS", 0, UserHandle.USER_CURRENT) == 0; + } + private boolean isTvUserSetupComplete() { return Settings.Secure.getIntForUser(mContext.getContentResolver(), Settings.Secure.TV_USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;