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

Commit 1b76b39a authored by Julius D'Souza's avatar Julius D'Souza Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: Add conditions for Auto to isUserSetupComplete() am: 9e0f7d9e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12951238

Change-Id: I8e0acbd4b77015384500b40f2fac71300328aaca
parents 53ee58bd 9e0f7d9e

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;