Merge "Reland 'Apply uid of original caller when starting LE scan by PendingIntent'" into main (6d1a8641) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/gatt/ContextMap.java

+17 −7

Original line number	Diff line number	Diff line
		@@ -209,12 +209,22 @@ public class ContextMap<C, T> {
		private Set<Connection> mConnections = new HashSet<Connection>();
		private final Object mConnectionsLock = new Object();

		/**
		* Add an entry to the application context list.
		*/
		App add(UUID uuid, WorkSource workSource, C callback, T info, GattService service) {
		int appUid = Binder.getCallingUid();
		String appName = service.getPackageManager().getNameForUid(appUid);
		/** Add an entry to the application context list. */
		App add(
		UUID uuid,
		WorkSource workSource,
		C callback,
		GattService.PendingIntentInfo piInfo,
		GattService service) {
		int appUid;
		String appName = null;
		if (piInfo != null) {
		appUid = piInfo.callingUid;
		appName = piInfo.callingPackage;
		} else {
		appUid = Binder.getCallingUid();
		appName = service.getPackageManager().getNameForUid(appUid);
		}
		if (appName == null) {
		// Assign an app name if one isn't found
		appName = "Unknown App (UID: " + appUid + ")";
		@@ -225,7 +235,7 @@ public class ContextMap<C, T> {
		appScanStats = new AppScanStats(appName, workSource, this, service);
		mAppScanStats.put(appUid, appScanStats);
		}
		App app = new App(uuid, callback, info, appName, appScanStats);
		App app = new App(uuid, callback, (T) piInfo, appName, appScanStats);
		mApps.add(app);
		appScanStats.isRegistered = true;
		return app;

android/app/src/com/android/bluetooth/gatt/GattService.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -209,6 +209,7 @@ public class GattService extends ProfileService {
		public ScanSettings settings;
		public List<ScanFilter> filters;
		public String callingPackage;
		public int callingUid;

		@Override
		public boolean equals(Object other) {
		@@ -3254,15 +3255,22 @@ public class GattService extends ProfileService {
		settings = enforceReportDelayFloor(settings);
		enforcePrivilegedPermissionIfNeeded(filters);
		UUID uuid = UUID.randomUUID();
		if (DBG) {
		Log.d(TAG, "startScan(PI) - UUID=" + uuid);
		}
		String callingPackage = attributionSource.getPackageName();
		int callingUid = attributionSource.getUid();
		PendingIntentInfo piInfo = new PendingIntentInfo();
		piInfo.intent = pendingIntent;
		piInfo.settings = settings;
		piInfo.filters = filters;
		piInfo.callingPackage = callingPackage;
		piInfo.callingUid = callingUid;
		if (DBG) {
		Log.d(
		TAG,
		"startScan(PI) -"
		+ (" UUID=" + uuid)
		+ (" Package=" + callingPackage)
		+ (" UID=" + callingUid));
		}

		// Don't start scan if the Pi scan already in mScannerMap.
		if (mScannerMap.getByContextInfo(piInfo) != null) {
		@@ -3313,7 +3321,7 @@ public class GattService extends ProfileService {
		void continuePiStartScan(int scannerId, ScannerMap.App app) {
		final PendingIntentInfo piInfo = app.info;
		final ScanClient scanClient =
		new ScanClient(scannerId, piInfo.settings, piInfo.filters);
		new ScanClient(scannerId, piInfo.settings, piInfo.filters, piInfo.callingUid);
		scanClient.hasLocationPermission = app.hasLocationPermission;
		scanClient.userHandle = app.mUserHandle;
		scanClient.isQApp = checkCallerTargetSdk(this, app.name, Build.VERSION_CODES.Q);

android/app/src/com/android/bluetooth/gatt/ScanClient.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -58,11 +58,15 @@ import java.util.Objects;
		}

		ScanClient(int scannerId, ScanSettings settings, List<ScanFilter> filters) {
		this(scannerId, settings, filters, Binder.getCallingUid());
		}

		ScanClient(int scannerId, ScanSettings settings, List<ScanFilter> filters, int appUid) {
		this.scannerId = scannerId;
		this.settings = settings;
		this.scanModeApp = settings.getScanMode();
		this.filters = filters;
		this.appUid = Binder.getCallingUid();
		this.appUid = appUid;
		}

		@Override

android/app/src/com/android/bluetooth/gatt/ScanManager.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -384,6 +384,7 @@ public class ScanManager {
		if (DBG) {
		Log.d(TAG, "handling starting scan");
		}
		fetchAppForegroundState(client);

		if (!isScanSupported(client)) {
		Log.e(TAG, "Scan settings not supported");
		@@ -730,6 +731,19 @@ public class ScanManager {
		return mIsUidForegroundMap.get(client.appUid, DEFAULT_UID_IS_FOREGROUND);
		}

		private void fetchAppForegroundState(ScanClient client) {
		if (mActivityManager == null \|\| mAdapterService.getPackageManager() == null) {
		return;
		}
		String packageName =
		mAdapterService.getPackageManager().getPackagesForUid(client.appUid)[0];
		int importance = mActivityManager.getPackageImportance(packageName);
		boolean isForeground =
		importance
		<= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE;
		mIsUidForegroundMap.put(client.appUid, isForeground);
		}

		private boolean updateScanModeBeforeStart(ScanClient client) {
		if (upgradeScanModeBeforeStart(client)) {
		return true;

android/app/tests/unit/src/com/android/bluetooth/gatt/GattServiceTest.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ import org.junit.Ignore;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentMatcher;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		@@ -263,6 +264,32 @@ public class GattServiceTest {
		verify(mScanManager).startScan(any());
		}

		@Test
		public void continuePiStartScanCheckUid() {
		int scannerId = 1;

		mPiInfo.settings = new ScanSettings.Builder().build();
		mPiInfo.callingUid = 123;
		mApp.info = mPiInfo;

		AppScanStats appScanStats = mock(AppScanStats.class);
		doReturn(appScanStats).when(mScannerMap).getAppScanStatsById(scannerId);

		mService.continuePiStartScan(scannerId, mApp);

		verify(appScanStats)
		.recordScanStart(mPiInfo.settings, mPiInfo.filters, false, false, scannerId);
		verify(mScanManager)
		.startScan(
		argThat(
		new ArgumentMatcher<ScanClient>() {
		@Override
		public boolean matches(ScanClient client) {
		return mPiInfo.callingUid == client.appUid;
		}
		}));
		}

		@Test
		public void onBatchScanReportsInternal_deliverBatchScan() throws RemoteException {
		int status = 1;