commit 9e0f7d9ef69f9b63865065b2db5f80c6f62cdab7
author Julius D'Souza <jdsouza@google.com> Wed Oct 28 11:24:29 2020 -0700
committer Julius D'souza <jdsouza@google.com> Thu Oct 29 20:47:00 2020 +0000
tree fadc168951c721e9717b3d6bfc9996a40147e08f
parent 8f692ef01a8ca95e87af317ff1fa6f0b75f6e616

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 <jdsouza@google.com>
Change-Id: Ica8b7bb5f06c34976e8acc5f540af19a98ef5dd6

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

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 3c42e93..5e5a53d 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 @@
                 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;