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

Merge "Device provisioned / user setup complete changes in HsumBootUserInitializer."

Browse Source
This commit is contained in:
Oli Lan
2023-02-03 17:18:28 +00:00
committed by Android (Google) Code Review
parent c19033da9f 806c3c9cfe
commit a4043d1b9f
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/java/com/android/server/HsumBootUserInitializer.java
View File

@@ -19,6 +19,9 @@ import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.content.ContentResolver;
import android.content.pm.UserInfo;
import android.database.ContentObserver;
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
@@ -40,6 +43,21 @@ final class HsumBootUserInitializer {
private final ActivityManagerService mAms;
private final ContentResolver mContentResolver;
private final ContentObserver mDeviceProvisionedObserver =
new ContentObserver(new Handler(Looper.getMainLooper())) {
@Override
public void onChange(boolean selfChange) {
// Set USER_SETUP_COMPLETE for the (headless) system user only when the device
// has been set up at least once.
if (isDeviceProvisioned()) {
Slogf.i(TAG, "Marking USER_SETUP_COMPLETE for system user");
Settings.Secure.putInt(mContentResolver,
Settings.Secure.USER_SETUP_COMPLETE, 1);
mContentResolver.unregisterContentObserver(mDeviceProvisionedObserver);
}
}
};
/** Whether this device should always have a non-removable MainUser, including at first boot. */
private final boolean mShouldAlwaysHaveMainUser;
@@ -72,10 +90,6 @@ final class HsumBootUserInitializer {
public void init(TimingsTraceAndSlog t) {
Slogf.i(TAG, "init())");
// TODO(b/204091126): in the long term, we need to decide who's reponsible for that,
// this class or the setup wizard app
provisionHeadlessSystemUser();
if (mShouldAlwaysHaveMainUser) {
t.traceBegin("createMainUserIfNeeded");
createMainUserIfNeeded();
@@ -115,6 +129,7 @@ final class HsumBootUserInitializer {
* apps have had the chance to set the boot user, if applicable.
*/
public void systemRunning(TimingsTraceAndSlog t) {
observeDeviceProvisioning();
unlockSystemUser(t);
try {
@@ -129,17 +144,16 @@ final class HsumBootUserInitializer {
}
}
/* TODO(b/261791491): STOPSHIP - SUW should be responsible for this. */
private void provisionHeadlessSystemUser() {
private void observeDeviceProvisioning() {
if (isDeviceProvisioned()) {
Slogf.d(TAG, "provisionHeadlessSystemUser(): already provisioned");
return;
}
Slogf.i(TAG, "Marking USER_SETUP_COMPLETE for system user");
Settings.Secure.putInt(mContentResolver, Settings.Secure.USER_SETUP_COMPLETE, 1);
Slogf.i(TAG, "Marking DEVICE_PROVISIONED for system user");
Settings.Global.putInt(mContentResolver, Settings.Global.DEVICE_PROVISIONED, 1);
mContentResolver.registerContentObserver(
Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED),
false,
mDeviceProvisionedObserver
);
}
private boolean isDeviceProvisioned() {