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

Commit 9e0f7d9e authored by Julius D'Souza's avatar Julius D'Souza Committed by Julius D'souza
Browse files

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



Similarly to Android TV, Android Auto also has a separate
secure setting for when setup is finished. Use this for
the default setup complete check.

Test: manual
Bug: 171432173
Signed-off-by: default avatarJulius D'Souza <jdsouza@google.com>
Change-Id: Ica8b7bb5f06c34976e8acc5f540af19a98ef5dd6
parent 8f692ef0

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;