Merge "Revert "Apply uid of original caller when starting LE scan by PendingIntent"" into main (f0c7602d) · Commits · e / os / android_packages_modules_Bluetooth

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

+7 −17

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

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

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

+3 −11

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

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

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

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

+1 −5

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

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

	@Override		@Override

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

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -387,8 +387,6 @@ public class ScanManager {
	Log.d(TAG, "handling starting scan");		Log.d(TAG, "handling starting scan");
	}		}

	fetchAppForegroundState(client);

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

	private void fetchAppForegroundState(ScanClient client) {
	if (mActivityManager == null) {
	return;
	}
	int importance = mActivityManager.getUidImportance(client.appUid);
	boolean isForeground =
	importance
	<= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE;
	mIsUidForegroundMap.put(client.appUid, isForeground);
	}

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

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

+0 −27

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

	@@ -264,32 +263,6 @@ public class GattServiceTest {
	verify(mScanManager).startScan(any());		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		@Test
	public void onBatchScanReportsInternal_deliverBatchScan() throws RemoteException {		public void onBatchScanReportsInternal_deliverBatchScan() throws RemoteException {
	int status = 1;		int status = 1;