Merge "Revert "Clear calling identity when calling getConnectionState internally"" into main (98048d8d) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2695,16 +2695,7 @@ public class AdapterService extends Service {
	return BluetoothDevice.CONNECTION_STATE_DISCONNECTED;		return BluetoothDevice.CONNECTION_STATE_DISCONNECTED;
	}		}

	if (Flags.apiGetConnectionStateUsingIdentityAddress()) {
	final long token = Binder.clearCallingIdentity();
	try {
	return service.getConnectionState(device);		return service.getConnectionState(device);
	} finally {
	Binder.restoreCallingIdentity(token);
	}
	} else {
	return service.getConnectionState(device);
	}
	}		}

	@Override		@Override