Merge "Move DPMS#hasUserSetupCompleted to Injector"

This commit is contained in:
TreeHugger Robot
2019-09-17 14:10:24 +00:00
committed by Android (Google) Code Review

View File

@@ -1999,6 +1999,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return LocalServices.getService(LockSettingsInternal.class);
}
boolean hasUserSetupCompleted(DevicePolicyData userData) {
return userData.mUserSetupComplete;
}
boolean isBuildDebuggable() {
return Build.IS_DEBUGGABLE;
}
@@ -8271,7 +8275,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
if (!mHasFeature) {
return true;
}
return getUserData(userHandle).mUserSetupComplete;
return mInjector.hasUserSetupCompleted(getUserData(userHandle));
}
private boolean hasPaired(int userHandle) {