Merge "Rename methods that take caller identity" (df3eb6cf) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -2197,7 +2197,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		reqPolicy, /* permission= */ null);
		}

		@NonNull ActiveAdmin getDeviceOwnerOfCallerLocked(final CallerIdentity caller) {
		@NonNull ActiveAdmin getDeviceOwnerLocked(final CallerIdentity caller) {
		ensureLocked();
		ComponentName doComponent = mOwners.getDeviceOwnerComponent();
		Preconditions.checkState(doComponent != null,
		@@ -2222,7 +2222,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		return doAdmin;
		}

		@NonNull ActiveAdmin getProfileOwnerOfCallerLocked(final CallerIdentity caller) {
		@NonNull ActiveAdmin getProfileOwnerLocked(final CallerIdentity caller) {
		ensureLocked();
		final ComponentName poAdminComponent = mOwners.getProfileOwnerComponent(caller.getUserId());

		@@ -2246,7 +2246,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		@NonNull ActiveAdmin getOrganizationOwnedProfileOwnerLocked(final CallerIdentity caller) {
		final ActiveAdmin profileOwner = getProfileOwnerOfCallerLocked(caller);
		final ActiveAdmin profileOwner = getProfileOwnerLocked(caller);

		Preconditions.checkCallAuthorization(
		mOwners.isProfileOwnerOfOrganizationOwnedDevice(caller.getUserId()),
		@@ -2268,10 +2268,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		if (poAdminComponent != null) {
		return getProfileOwnerOfCallerLocked(caller);
		return getProfileOwnerLocked(caller);
		}

		return getDeviceOwnerOfCallerLocked(caller);
		return getDeviceOwnerLocked(caller);
		}

		@NonNull ActiveAdmin getParentOfAdminIfRequired(ActiveAdmin admin, boolean parent) {
		@@ -4428,7 +4428,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		String.format("UID %d is not a device or profile owner", caller.getUid()));

		synchronized (getLockObject()) {
		ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(caller.getUserId());
		ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userHandle);
		if (admin != null) {
		if (getTargetSdk(admin.info.getPackageName(), userHandle) < Build.VERSION_CODES.O) {
		Slog.e(LOG_TAG, "DPC can no longer call resetPassword()");
		@@ -14771,7 +14771,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		Preconditions.checkCallAuthorization(isProfileOwnerOfOrganizationOwnedDevice(caller));

		synchronized (getLockObject()) {
		final ActiveAdmin admin = getProfileOwnerOfCallerLocked(caller);
		final ActiveAdmin admin = getProfileOwnerLocked(caller);
		final long deadline = admin.mProfileOffDeadline;
		final int result = makeSuspensionReasons(admin.mSuspendPersonalApps,
		deadline != 0 && mInjector.systemCurrentTimeMillis() > deadline);
		@@ -14804,7 +14804,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		final int callingUserId = caller.getUserId();
		synchronized (getLockObject()) {
		final ActiveAdmin admin = getProfileOwnerOfCallerLocked(caller);
		final ActiveAdmin admin = getProfileOwnerLocked(caller);
		boolean shouldSaveSettings = false;
		if (admin.mSuspendPersonalApps != suspended) {
		admin.mSuspendPersonalApps = suspended;
		@@ -15069,7 +15069,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		final int userId = caller.getUserId();
		synchronized (getLockObject()) {
		final ActiveAdmin admin = getProfileOwnerOfCallerLocked(caller);
		final ActiveAdmin admin = getProfileOwnerLocked(caller);

		// Ensure the timeout is long enough to avoid having bad user experience.
		if (timeoutMillis > 0 && timeoutMillis < MANAGED_PROFILE_MAXIMUM_TIME_OFF_THRESHOLD
		@@ -15114,7 +15114,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		Preconditions.checkCallAuthorization(isProfileOwnerOfOrganizationOwnedDevice(caller));

		synchronized (getLockObject()) {
		final ActiveAdmin admin = getProfileOwnerOfCallerLocked(caller);
		final ActiveAdmin admin = getProfileOwnerLocked(caller);
		return admin.mProfileMaximumTimeOffMillis;
		}
		}