Merge "Update network logging metrics" into sc-dev (20fcf469) · Commits · e / os / android_frameworks_base

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -534,8 +534,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		/**
		* Strings logged with {@link
		* com.android.internal.logging.nano.MetricsProto.MetricsEvent#PROVISIONING_ENTRY_POINT_ADB}
		* and {@link DevicePolicyEnums#PROVISIONING_ENTRY_POINT_ADB}.
		* com.android.internal.logging.nano.MetricsProto.MetricsEvent#PROVISIONING_ENTRY_POINT_ADB},
		* {@link DevicePolicyEnums#PROVISIONING_ENTRY_POINT_ADB},
		* {@link DevicePolicyEnums#SET_NETWORK_LOGGING_ENABLED} and
		* {@link DevicePolicyEnums#RETRIEVE_NETWORK_LOGS}.
		*/
		private static final String LOG_TAG_PROFILE_OWNER = "profile-owner";
		private static final String LOG_TAG_DEVICE_OWNER = "device-owner";
		@@ -14165,9 +14167,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		return;
		}
		final CallerIdentity caller = getCallerIdentity(admin, packageName);
		final boolean isManagedProfileOwner = isProfileOwner(caller)
		&& isManagedProfile(caller.getUserId());
		Preconditions.checkCallAuthorization((caller.hasAdminComponent()
		&& (isDeviceOwner(caller)
		\|\| (isProfileOwner(caller) && isManagedProfile(caller.getUserId()))))
		&& (isDeviceOwner(caller) \|\| isManagedProfileOwner))
		\|\| (caller.hasPackage() && isCallerDelegate(caller, DELEGATION_NETWORK_LOGGING)));

		synchronized (getLockObject()) {
		@@ -14189,6 +14192,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		.setAdmin(caller.getPackageName())
		.setBoolean(/* isDelegate */ admin == null)
		.setInt(enabled ? 1 : 0)
		.setStrings(isManagedProfileOwner
		? LOG_TAG_PROFILE_OWNER : LOG_TAG_DEVICE_OWNER)
		.write();
		}
		}
		@@ -14345,9 +14350,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		return null;
		}
		final CallerIdentity caller = getCallerIdentity(admin, packageName);
		final boolean isManagedProfileOwner = isProfileOwner(caller)
		&& isManagedProfile(caller.getUserId());
		Preconditions.checkCallAuthorization((caller.hasAdminComponent()
		&& (isDeviceOwner(caller)
		\|\| (isProfileOwner(caller) && isManagedProfile(caller.getUserId()))))
		&& (isDeviceOwner(caller) \|\| isManagedProfileOwner))
		\|\| (caller.hasPackage() && isCallerDelegate(caller, DELEGATION_NETWORK_LOGGING)));
		if (mOwners.hasDeviceOwner()) {
		checkAllUsersAreAffiliatedWithDevice();
		@@ -14361,6 +14367,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		.createEvent(DevicePolicyEnums.RETRIEVE_NETWORK_LOGS)
		.setAdmin(caller.getPackageName())
		.setBoolean(/* isDelegate */ admin == null)
		.setStrings(isManagedProfileOwner
		? LOG_TAG_PROFILE_OWNER : LOG_TAG_DEVICE_OWNER)
		.write();

		final long currentTime = System.currentTimeMillis();