Merge "Rename featureId -> attributionTag" into rvc-dev-plus-aosp am: b5ccedfe4d (e0ddda0b) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -849,7 +849,7 @@ public final class BluetoothAdapter {
		synchronized (mLock) {
		if (sBluetoothLeScanner == null) {
		sBluetoothLeScanner = new BluetoothLeScanner(mManagerService, getOpPackageName(),
		getFeatureId());
		getAttributionTag());
		}
		}
		return sBluetoothLeScanner;
		@@ -1663,11 +1663,11 @@ public final class BluetoothAdapter {
		return ActivityThread.currentOpPackageName();
		}

		private String getFeatureId() {
		private String getAttributionTag() {
		// Workaround for legacy API for getting a BluetoothAdapter not
		// passing a context
		if (mContext != null) {
		return mContext.getFeatureId();
		return mContext.getAttributionTag();
		}
		return null;
		}
		@@ -1709,7 +1709,7 @@ public final class BluetoothAdapter {
		try {
		mServiceLock.readLock().lock();
		if (mService != null) {
		return mService.startDiscovery(getOpPackageName(), getFeatureId());
		return mService.startDiscovery(getOpPackageName(), getAttributionTag());
		}
		} catch (RemoteException e) {
		Log.e(TAG, "", e);

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ public final class BluetoothManager {
		* @hide
		*/
		public BluetoothManager(Context context) {
		if (context.getFeatureId() == null) {
		if (context.getAttributionTag() == null) {
		context = context.getApplicationContext();
		if (context == null) {
		throw new IllegalArgumentException(