From 9e0f7d9ef69f9b63865065b2db5f80c6f62cdab7 Mon Sep 17 00:00:00 2001 From: Julius D'Souza Date: Wed, 28 Oct 2020 11:24:29 -0700 Subject: 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: Julius D'Souza Change-Id: Ica8b7bb5f06c34976e8acc5f540af19a98ef5dd6 --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 3c42e930389b..5e5a53d066f6 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -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; -- cgit v1.2.3-59-g8ed1b