Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: Icfb47bbfd6a04323343d93cc4a7f636bc6c1f280
This commit is contained in:
Treehugger Robot
2021-10-18 22:05:26 +00:00
committed by Automerger Merge Worker
parent c0f0020671 8bc4a18d21
commit 881188aec1
3 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1186,11 +1186,6 @@ public final class BluetoothDevice implements Parcelable, Attributable {
mAttributionSource = attributionSource; mAttributionSource = attributionSource;
} }
/** {@hide} */
public void prepareToEnterProcess(@NonNull AttributionSource attributionSource) {
setAttributionSource(attributionSource);
}
@Override @Override
public boolean equals(@Nullable Object o) { public boolean equals(@Nullable Object o) {
if (o instanceof BluetoothDevice) { if (o instanceof BluetoothDevice) {

13
core/java/android/bluetooth/BluetoothManager.java
View File

@@ -62,15 +62,15 @@ public final class BluetoothManager {
private static final String TAG = "BluetoothManager"; private static final String TAG = "BluetoothManager";
private static final boolean DBG = false; private static final boolean DBG = false;
private final AttributionSource mAttributionSource; private static AttributionSource sAttributionSource = null;
private final BluetoothAdapter mAdapter; private final BluetoothAdapter mAdapter;
/** /**
* @hide * @hide
*/ */
public BluetoothManager(Context context) { public BluetoothManager(Context context) {
mAttributionSource = resolveAttributionSource(context); sAttributionSource = resolveAttributionSource(context);
mAdapter = BluetoothAdapter.createAdapter(mAttributionSource); mAdapter = BluetoothAdapter.createAdapter(sAttributionSource);
} }
/** {@hide} */ /** {@hide} */
@@ -79,6 +79,9 @@ public final class BluetoothManager {
if (context != null) { if (context != null) {
res = context.getAttributionSource(); res = context.getAttributionSource();
} }
else if (sAttributionSource != null) {
return sAttributionSource;
}
if (res == null) { if (res == null) {
res = ActivityThread.currentAttributionSource(); res = ActivityThread.currentAttributionSource();
} }
@@ -198,8 +201,8 @@ public final class BluetoothManager {
IBluetoothGatt iGatt = managerService.getBluetoothGatt(); IBluetoothGatt iGatt = managerService.getBluetoothGatt();
if (iGatt == null) return devices; if (iGatt == null) return devices;
devices = Attributable.setAttributionSource( devices = Attributable.setAttributionSource(
iGatt.getDevicesMatchingConnectionStates(states, mAttributionSource), iGatt.getDevicesMatchingConnectionStates(states, sAttributionSource),
mAttributionSource); sAttributionSource);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "", e); Log.e(TAG, "", e);
} }

11
core/java/android/content/Intent.java
View File

@@ -31,7 +31,6 @@ import android.annotation.SuppressLint;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.app.AppGlobals; import android.app.AppGlobals;
import android.bluetooth.BluetoothDevice;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
@@ -11462,16 +11461,6 @@ public class Intent implements Parcelable, Cloneable {
if (fromProtectedComponent) { if (fromProtectedComponent) {
mLocalFlags |= LOCAL_FLAG_FROM_PROTECTED_COMPONENT; mLocalFlags |= LOCAL_FLAG_FROM_PROTECTED_COMPONENT;
} }
// Special attribution fix-up logic for any BluetoothDevice extras
// passed via Bluetooth intents
if (mAction != null && mAction.startsWith("android.bluetooth.")
&& hasExtra(BluetoothDevice.EXTRA_DEVICE)) {
final BluetoothDevice device = getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
if (device != null) {
device.prepareToEnterProcess(source);
}
}
} }
/** @hide */ /** @hide */