Merge "DO NOT MERGE: Add conditions for Auto to isUserSetupComplete()" into rvc-qpr-dev (2efeb427) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -1466,10 +1466,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;