Merge "Revert "[CDM] Add CompanionExemptionProcessor"" into main (d9d891dc) · Commits · e / os / android_frameworks_base

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+179 −37

Original line number	Diff line number	Diff line
		@@ -31,13 +31,16 @@ import static android.os.UserHandle.getCallingUserId;

		import static com.android.internal.util.CollectionUtils.any;
		import static com.android.internal.util.Preconditions.checkState;
		import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
		import static com.android.server.companion.utils.PackageUtils.enforceUsesCompanionDeviceFeature;
		import static com.android.server.companion.utils.PackageUtils.getPackageInfo;
		import static com.android.server.companion.utils.PackageUtils.isRestrictedSettingsAllowed;
		import static com.android.server.companion.utils.PermissionsUtils.enforceCallerCanManageAssociationsForPackage;
		import static com.android.server.companion.utils.PermissionsUtils.enforceCallerIsSystemOr;
		import static com.android.server.companion.utils.PermissionsUtils.enforceCallerIsSystemOrCanInteractWithUserId;

		import static java.util.Objects.requireNonNull;
		import static java.util.concurrent.TimeUnit.MINUTES;

		import android.annotation.EnforcePermission;
		import android.annotation.NonNull;
		@@ -66,22 +69,31 @@ import android.companion.datatransfer.PermissionSyncRequest;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManagerInternal;
		import android.net.MacAddress;
		import android.net.NetworkPolicyManager;
		import android.os.Binder;
		import android.os.Environment;
		import android.os.Parcel;
		import android.os.ParcelFileDescriptor;
		import android.os.PowerExemptionManager;
		import android.os.PowerManagerInternal;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.permission.flags.Flags;
		import android.util.ArraySet;
		import android.util.ExceptionUtils;
		import android.util.Slog;

		import com.android.internal.app.IAppOpsService;
		import com.android.internal.content.PackageMonitor;
		import com.android.internal.notification.NotificationAccessConfirmationActivityContract;
		import com.android.internal.os.BackgroundThread;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.DumpUtils;
		import com.android.server.FgThread;
		@@ -102,27 +114,35 @@ import com.android.server.companion.devicepresence.DevicePresenceProcessor;
		import com.android.server.companion.devicepresence.ObservableUuid;
		import com.android.server.companion.devicepresence.ObservableUuidStore;
		import com.android.server.companion.transport.CompanionTransportManager;
		import com.android.server.pm.UserManagerInternal;
		import com.android.server.wm.ActivityTaskManagerInternal;

		import java.io.File;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Collection;
		import java.util.List;
		import java.util.concurrent.ExecutorService;
		import java.util.concurrent.Executors;
		import java.util.Set;

		@SuppressLint("LongLogTag")
		public class CompanionDeviceManagerService extends SystemService {
		private static final String TAG = "CDM_CompanionDeviceManagerService";

		private static final long PAIR_WITHOUT_PROMPT_WINDOW_MS = 10 * 60 * 1000; // 10 min

		private static final String PREF_FILE_NAME = "companion_device_preferences.xml";
		private static final String PREF_KEY_AUTO_REVOKE_GRANTS_DONE = "auto_revoke_grants_done";
		private static final int MAX_CN_LENGTH = 500;

		private final ActivityTaskManagerInternal mAtmInternal;
		private final ActivityManagerInternal mAmInternal;
		private final IAppOpsService mAppOpsManager;
		private final PowerExemptionManager mPowerExemptionManager;
		private final PackageManagerInternal mPackageManagerInternal;

		private final AssociationStore mAssociationStore;
		private final SystemDataTransferRequestStore mSystemDataTransferRequestStore;
		private final ObservableUuidStore mObservableUuidStore;

		private final CompanionExemptionProcessor mCompanionExemptionProcessor;
		private final AssociationRequestsProcessor mAssociationRequestsProcessor;
		private final SystemDataTransferProcessor mSystemDataTransferProcessor;
		private final BackupRestoreProcessor mBackupRestoreProcessor;
		@@ -136,15 +156,12 @@ public class CompanionDeviceManagerService extends SystemService {
		super(context);

		final ActivityManager activityManager = context.getSystemService(ActivityManager.class);
		final PowerExemptionManager powerExemptionManager = context.getSystemService(
		PowerExemptionManager.class);
		final AppOpsManager appOpsManager = context.getSystemService(AppOpsManager.class);
		final ActivityTaskManagerInternal atmInternal = LocalServices.getService(
		ActivityTaskManagerInternal.class);
		final ActivityManagerInternal amInternal = LocalServices.getService(
		ActivityManagerInternal.class);
		final PackageManagerInternal packageManagerInternal = LocalServices.getService(
		PackageManagerInternal.class);
		mPowerExemptionManager = context.getSystemService(PowerExemptionManager.class);
		mAppOpsManager = IAppOpsService.Stub.asInterface(
		ServiceManager.getService(Context.APP_OPS_SERVICE));
		mAtmInternal = LocalServices.getService(ActivityTaskManagerInternal.class);
		mAmInternal = LocalServices.getService(ActivityManagerInternal.class);
		mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);
		final UserManager userManager = context.getSystemService(UserManager.class);
		final PowerManagerInternal powerManagerInternal = LocalServices.getService(
		PowerManagerInternal.class);
		@@ -156,29 +173,25 @@ public class CompanionDeviceManagerService extends SystemService {

		// Init processors
		mAssociationRequestsProcessor = new AssociationRequestsProcessor(context,
		packageManagerInternal, mAssociationStore);
		mBackupRestoreProcessor = new BackupRestoreProcessor(context, packageManagerInternal,
		mPackageManagerInternal, mAssociationStore);
		mBackupRestoreProcessor = new BackupRestoreProcessor(context, mPackageManagerInternal,
		mAssociationStore, associationDiskStore, mSystemDataTransferRequestStore,
		mAssociationRequestsProcessor);

		mCompanionAppBinder = new CompanionAppBinder(context);

		mCompanionExemptionProcessor = new CompanionExemptionProcessor(context,
		powerExemptionManager, appOpsManager, packageManagerInternal, atmInternal,
		amInternal, mAssociationStore);

		mDevicePresenceProcessor = new DevicePresenceProcessor(context,
		mCompanionAppBinder, userManager, mAssociationStore, mObservableUuidStore,
		powerManagerInternal, mCompanionExemptionProcessor);
		powerManagerInternal);

		mTransportManager = new CompanionTransportManager(context, mAssociationStore);

		mDisassociationProcessor = new DisassociationProcessor(context, activityManager,
		mAssociationStore, packageManagerInternal, mDevicePresenceProcessor,
		mAssociationStore, mPackageManagerInternal, mDevicePresenceProcessor,
		mCompanionAppBinder, mSystemDataTransferRequestStore, mTransportManager);

		mSystemDataTransferProcessor = new SystemDataTransferProcessor(this,
		packageManagerInternal, mAssociationStore,
		mPackageManagerInternal, mAssociationStore,
		mSystemDataTransferRequestStore, mTransportManager);

		// TODO(b/279663946): move context sync to a dedicated system service
		@@ -189,6 +202,7 @@ public class CompanionDeviceManagerService extends SystemService {
		public void onStart() {
		// Init association stores
		mAssociationStore.refreshCache();
		mAssociationStore.registerLocalListener(mAssociationStoreChangeListener);

		// Init UUID store
		mObservableUuidStore.getObservableUuidsForUser(getContext().getUserId());
		@@ -226,11 +240,11 @@ public class CompanionDeviceManagerService extends SystemService {

		if (associations.isEmpty()) return;

		mCompanionExemptionProcessor.updateAtm(userId, associations);
		updateAtm(userId, associations);

		try (ExecutorService executor = Executors.newSingleThreadExecutor()) {
		executor.execute(mCompanionExemptionProcessor::updateAutoRevokeExemptions);
		}
		BackgroundThread.getHandler().sendMessageDelayed(
		obtainMessage(CompanionDeviceManagerService::maybeGrantAutoRevokeExemptions, this),
		MINUTES.toMillis(10));
		}

		@Override
		@@ -248,30 +262,30 @@ public class CompanionDeviceManagerService extends SystemService {
		if (!associationsForPackage.isEmpty()) {
		Slog.i(TAG, "Package removed or data cleared for user=[" + userId + "], package=["
		+ packageName + "]. Cleaning up CDM data...");

		}
		for (AssociationInfo association : associationsForPackage) {
		mDisassociationProcessor.disassociate(association.getId());
		}

		mCompanionAppBinder.onPackagesChanged(userId, packageName);
		}

		// Clear observable UUIDs for the package.
		final List<ObservableUuid> uuidsTobeObserved =
		mObservableUuidStore.getObservableUuidsForPackage(userId, packageName);
		for (ObservableUuid uuid : uuidsTobeObserved) {
		mObservableUuidStore.removeObservableUuid(userId, uuid.getUuid(), packageName);
		}

		mCompanionAppBinder.onPackagesChanged(userId);
		}

		private void onPackageModifiedInternal(@UserIdInt int userId, @NonNull String packageName) {
		final List<AssociationInfo> associations =
		final List<AssociationInfo> associationsForPackage =
		mAssociationStore.getAssociationsByPackage(userId, packageName);
		if (!associations.isEmpty()) {
		mCompanionExemptionProcessor.exemptPackage(userId, packageName, false);

		mCompanionAppBinder.onPackagesChanged(userId, packageName);
		for (AssociationInfo association : associationsForPackage) {
		updateSpecialAccessPermissionForAssociatedPackage(association.getUserId(),
		association.getPackageName());
		}

		mCompanionAppBinder.onPackagesChanged(userId);
		}

		private void onPackageAddedInternal(@UserIdInt int userId, @NonNull String packageName) {
		@@ -751,6 +765,130 @@ public class CompanionDeviceManagerService extends SystemService {
		}
		}

		/**
		* Update special access for the association's package
		*/
		public void updateSpecialAccessPermissionForAssociatedPackage(int userId, String packageName) {
		final PackageInfo packageInfo =
		getPackageInfo(getContext(), userId, packageName);

		Binder.withCleanCallingIdentity(() -> updateSpecialAccessPermissionAsSystem(packageInfo));
		}

		private void updateSpecialAccessPermissionAsSystem(PackageInfo packageInfo) {
		if (packageInfo == null) {
		return;
		}

		if (containsEither(packageInfo.requestedPermissions,
		android.Manifest.permission.RUN_IN_BACKGROUND,
		android.Manifest.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND)) {
		mPowerExemptionManager.addToPermanentAllowList(packageInfo.packageName);
		} else {
		try {
		mPowerExemptionManager.removeFromPermanentAllowList(packageInfo.packageName);
		} catch (UnsupportedOperationException e) {
		Slog.w(TAG, packageInfo.packageName + " can't be removed from power save"
		+ " whitelist. It might due to the package is whitelisted by the system.");
		}
		}

		NetworkPolicyManager networkPolicyManager = NetworkPolicyManager.from(getContext());
		try {
		if (containsEither(packageInfo.requestedPermissions,
		android.Manifest.permission.USE_DATA_IN_BACKGROUND,
		android.Manifest.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND)) {
		networkPolicyManager.addUidPolicy(
		packageInfo.applicationInfo.uid,
		NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND);
		} else {
		networkPolicyManager.removeUidPolicy(
		packageInfo.applicationInfo.uid,
		NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND);
		}
		} catch (IllegalArgumentException e) {
		Slog.e(TAG, e.getMessage());
		}

		exemptFromAutoRevoke(packageInfo.packageName, packageInfo.applicationInfo.uid);
		}

		private void exemptFromAutoRevoke(String packageName, int uid) {
		try {
		mAppOpsManager.setMode(
		AppOpsManager.OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED,
		uid,
		packageName,
		AppOpsManager.MODE_IGNORED);
		} catch (RemoteException e) {
		Slog.w(TAG, "Error while granting auto revoke exemption for " + packageName, e);
		}
		}

		private void updateAtm(int userId, List<AssociationInfo> associations) {
		final Set<Integer> companionAppUids = new ArraySet<>();
		for (AssociationInfo association : associations) {
		final int uid = mPackageManagerInternal.getPackageUid(association.getPackageName(),
		0, userId);
		if (uid >= 0) {
		companionAppUids.add(uid);
		}
		}
		if (mAtmInternal != null) {
		mAtmInternal.setCompanionAppUids(userId, companionAppUids);
		}
		if (mAmInternal != null) {
		// Make a copy of the set and send it to ActivityManager.
		mAmInternal.setCompanionAppUids(userId, new ArraySet<>(companionAppUids));
		}
		}

		private void maybeGrantAutoRevokeExemptions() {
		Slog.d(TAG, "maybeGrantAutoRevokeExemptions()");

		PackageManager pm = getContext().getPackageManager();
		for (int userId : LocalServices.getService(UserManagerInternal.class).getUserIds()) {
		SharedPreferences pref = getContext().getSharedPreferences(
		new File(Environment.getUserSystemDirectory(userId), PREF_FILE_NAME),
		Context.MODE_PRIVATE);
		if (pref.getBoolean(PREF_KEY_AUTO_REVOKE_GRANTS_DONE, false)) {
		continue;
		}

		try {
		final List<AssociationInfo> associations =
		mAssociationStore.getActiveAssociationsByUser(userId);
		for (AssociationInfo a : associations) {
		try {
		int uid = pm.getPackageUidAsUser(a.getPackageName(), userId);
		exemptFromAutoRevoke(a.getPackageName(), uid);
		} catch (PackageManager.NameNotFoundException e) {
		Slog.w(TAG, "Unknown companion package: " + a.getPackageName(), e);
		}
		}
		} finally {
		pref.edit().putBoolean(PREF_KEY_AUTO_REVOKE_GRANTS_DONE, true).apply();
		}
		}
		}

		private final AssociationStore.OnChangeListener mAssociationStoreChangeListener =
		new AssociationStore.OnChangeListener() {
		@Override
		public void onAssociationChanged(int changeType, AssociationInfo association) {
		Slog.d(TAG, "onAssociationChanged changeType=[" + changeType
		+ "], association=[" + association);

		final int userId = association.getUserId();
		final List<AssociationInfo> updatedAssociations =
		mAssociationStore.getActiveAssociationsByUser(userId);

		updateAtm(userId, updatedAssociations);
		updateSpecialAccessPermissionForAssociatedPackage(association.getUserId(),
		association.getPackageName());
		}
		};

		private final PackageMonitor mPackageMonitor = new PackageMonitor() {
		@Override
		public void onPackageRemoved(String packageName, int uid) {
		@@ -773,6 +911,10 @@ public class CompanionDeviceManagerService extends SystemService {
		}
		};

		private static <T> boolean containsEither(T[] array, T a, T b) {
		return ArrayUtils.contains(array, a) \|\| ArrayUtils.contains(array, b);
		}

		private class LocalService implements CompanionDeviceManagerServiceInternal {

		@Override

services/companion/java/com/android/server/companion/CompanionExemptionProcessor.java

deleted100644 → 0

+0 −219

File deleted.

Preview size limit exceeded, changes collapsed.

services/companion/java/com/android/server/companion/devicepresence/CompanionAppBinder.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -95,10 +95,7 @@ public class CompanionAppBinder {
		/**
		* On package changed.
		*/
		public void onPackagesChanged(@UserIdInt int userId, String packageName) {
		// TODO: We shouldn't need to clean up the whole user registry. We only need to remove the
		// package. I will do it in a separate change since it's not appropriate to use
		// PerUser anymore.
		public void onPackagesChanged(@UserIdInt int userId) {
		mCompanionServicesRegister.invalidate(userId);
		}

services/companion/java/com/android/server/companion/devicepresence/DevicePresenceProcessor.java

+10 −17

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import android.util.SparseBooleanArray;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.util.CollectionUtils;
		import com.android.server.companion.CompanionExemptionProcessor;
		import com.android.server.companion.association.AssociationStore;

		import java.io.PrintWriter;
		@@ -102,8 +101,6 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		private final PowerManagerInternal mPowerManagerInternal;
		@NonNull
		private final UserManager mUserManager;
		@NonNull
		private final CompanionExemptionProcessor mCompanionExemptionProcessor;

		// NOTE: Same association may appear in more than one of the following sets at the same time.
		// (E.g. self-managed devices that have MAC addresses, could be reported as present by their
		@@ -114,7 +111,7 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		@NonNull
		private final Set<Integer> mNearbyBleDevices = new HashSet<>();
		@NonNull
		private final Set<Integer> mConnectedSelfManagedDevices = new HashSet<>();
		private final Set<Integer> mReportedSelfManagedDevices = new HashSet<>();
		@NonNull
		private final Set<ParcelUuid> mConnectedUuidDevices = new HashSet<>();
		@NonNull
		@@ -149,8 +146,7 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		@NonNull UserManager userManager,
		@NonNull AssociationStore associationStore,
		@NonNull ObservableUuidStore observableUuidStore,
		@NonNull PowerManagerInternal powerManagerInternal,
		@NonNull CompanionExemptionProcessor companionExemptionProcessor) {
		@NonNull PowerManagerInternal powerManagerInternal) {
		mContext = context;
		mCompanionAppBinder = companionAppBinder;
		mAssociationStore = associationStore;
		@@ -160,7 +156,6 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		mObservableUuidStore, this);
		mBleDeviceProcessor = new BleDeviceProcessor(associationStore, this);
		mPowerManagerInternal = powerManagerInternal;
		mCompanionExemptionProcessor = companionExemptionProcessor;
		}

		/** Initialize {@link DevicePresenceProcessor} */
		@@ -409,7 +404,7 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		* nearby (for "self-managed" associations).
		*/
		public boolean isDevicePresent(int associationId) {
		return mConnectedSelfManagedDevices.contains(associationId)
		return mReportedSelfManagedDevices.contains(associationId)
		\|\| mConnectedBtDevices.contains(associationId)
		\|\| mNearbyBleDevices.contains(associationId)
		\|\| mSimulated.contains(associationId);
		@@ -456,7 +451,7 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		* notifyDeviceAppeared()}
		*/
		public void onSelfManagedDeviceConnected(int associationId) {
		onDevicePresenceEvent(mConnectedSelfManagedDevices,
		onDevicePresenceEvent(mReportedSelfManagedDevices,
		associationId, EVENT_SELF_MANAGED_APPEARED);
		}

		@@ -472,7 +467,7 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		* notifyDeviceDisappeared()}
		*/
		public void onSelfManagedDeviceDisconnected(int associationId) {
		onDevicePresenceEvent(mConnectedSelfManagedDevices,
		onDevicePresenceEvent(mReportedSelfManagedDevices,
		associationId, EVENT_SELF_MANAGED_DISAPPEARED);
		}

		@@ -480,7 +475,7 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		* Marks a "self-managed" device as disconnected when binderDied.
		*/
		public void onSelfManagedDeviceReporterBinderDied(int associationId) {
		onDevicePresenceEvent(mConnectedSelfManagedDevices,
		onDevicePresenceEvent(mReportedSelfManagedDevices,
		associationId, EVENT_SELF_MANAGED_DISAPPEARED);
		}

		@@ -688,7 +683,6 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene

		if (association.shouldBindWhenPresent()) {
		bindApplicationIfNeeded(userId, packageName, association.isSelfManaged());
		mCompanionExemptionProcessor.exemptPackage(userId, packageName, true);
		} else {
		return;
		}
		@@ -721,7 +715,6 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		// Check if there are other devices associated to the app that are present.
		if (!shouldBindPackage(userId, packageName)) {
		mCompanionAppBinder.unbindCompanionApp(userId, packageName);
		mCompanionExemptionProcessor.exemptPackage(userId, packageName, false);
		}
		break;
		default:
		@@ -947,7 +940,7 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene

		mConnectedBtDevices.remove(id);
		mNearbyBleDevices.remove(id);
		mConnectedSelfManagedDevices.remove(id);
		mReportedSelfManagedDevices.remove(id);
		mSimulated.remove(id);
		synchronized (mBtDisconnectedDevices) {
		mBtDisconnectedDevices.remove(id);
		@@ -1107,7 +1100,7 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		out.append("Companion Device Present: ");
		if (mConnectedBtDevices.isEmpty()
		&& mNearbyBleDevices.isEmpty()
		&& mConnectedSelfManagedDevices.isEmpty()) {
		&& mReportedSelfManagedDevices.isEmpty()) {
		out.append("<empty>\n");
		return;
		} else {
		@@ -1137,11 +1130,11 @@ public class DevicePresenceProcessor implements AssociationStore.OnChangeListene
		}

		out.append(" Self-Reported Devices: ");
		if (mConnectedSelfManagedDevices.isEmpty()) {
		if (mReportedSelfManagedDevices.isEmpty()) {
		out.append("<empty>\n");
		} else {
		out.append("\n");
		for (int associationId : mConnectedSelfManagedDevices) {
		for (int associationId : mReportedSelfManagedDevices) {
		AssociationInfo a = mAssociationStore.getAssociationById(associationId);
		out.append(" ").append(a.toShortString()).append('\n');
		}