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

Merge "Check mSetupComplete on initialization to avoid service being disabled." into qt-r1-dev

Browse Source 
am: 74a0753481

Change-Id: I6dc1f0acc283927ea4603d1a7706cd82e07ddc0c
This commit is contained in:
Adam He
2019-07-10 18:06:54 -07:00
committed by android-build-merger
parent a4506332e7 74a0753481
commit db850d9175
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
View File

@@ -75,6 +75,14 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst
mMaster = master;
mLock = lock;
mUserId = userId;
updateIsSetupComplete(userId);
}
/** Updates whether setup is complete for current user */
private void updateIsSetupComplete(@UserIdInt int userId) {
final String setupComplete = Settings.Secure.getStringForUser(
getContext().getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, userId);
mSetupComplete = "1".equals(setupComplete);
}
/**
@@ -143,9 +151,7 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst
+ ", disabled=" + disabled + ", mDisabled=" + mDisabled);
}
final String setupComplete = Settings.Secure.getStringForUser(
getContext().getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, mUserId);
mSetupComplete = "1".equals(setupComplete);
updateIsSetupComplete(mUserId);
mDisabled = disabled;
updateServiceInfoLocked();