Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8e0acbd4b77015384500b40f2fac71300328aaca
This commit is contained in:
Julius D'Souza
2020-11-05 02:17:11 +00:00
committed by Automerger Merge Worker
parent 53ee58bdc8 9e0f7d9ef6
commit 1b76b39af7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -1466,10 +1466,17 @@ public class PhoneWindowManager implements WindowManagerPolicy {
Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0; Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;
if (mHasFeatureLeanback) { if (mHasFeatureLeanback) {
isSetupComplete &= isTvUserSetupComplete(); isSetupComplete &= isTvUserSetupComplete();
} else if (mHasFeatureAuto) {
isSetupComplete &= isAutoUserSetupComplete();
} }
return isSetupComplete; 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() { private boolean isTvUserSetupComplete() {
return Settings.Secure.getIntForUser(mContext.getContentResolver(), return Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.TV_USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0; Settings.Secure.TV_USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;