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
This commit is contained in:
TreeHugger Robot
2019-07-11 00:29:27 +00:00
committed by Android (Google) Code Review
parent b5bf60eb09 6384812b27
commit 74a0753481
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; mMaster = master;
mLock = lock; mLock = lock;
mUserId = userId; 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); + ", disabled=" + disabled + ", mDisabled=" + mDisabled);
} }
final String setupComplete = Settings.Secure.getStringForUser( updateIsSetupComplete(mUserId);
getContext().getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, mUserId);
mSetupComplete = "1".equals(setupComplete);
mDisabled = disabled; mDisabled = disabled;
updateServiceInfoLocked(); updateServiceInfoLocked();