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

Merge "BT_MAINLINE Delete getControllerActivityEnergyInfo" am: 4045c6f336 am: a74b7f7406

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

Change-Id: I876b137606e9997a3975252b6c6e725d85459854
This commit is contained in:
Rahul Sabnis
2021-11-24 23:24:42 +00:00
committed by Automerger Merge Worker
parent d3366befa6 a74b7f7406
commit 8dd67f3e31
1 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -51,7 +51,6 @@ import android.compat.annotation.UnsupportedAppUsage;
import android.content.Attributable; import android.content.Attributable;
import android.content.AttributionSource; import android.content.AttributionSource;
import android.content.Context; import android.content.Context;
import android.os.BatteryStats;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
@@ -59,7 +58,6 @@ import android.os.ParcelUuid;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ResultReceiver; import android.os.ResultReceiver;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SynchronousResultReceiver;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -82,7 +80,6 @@ import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
/** /**
@@ -2423,38 +2420,6 @@ public final class BluetoothAdapter {
return false; return false;
} }
/**
* Return the record of {@link BluetoothActivityEnergyInfo} object that
* has the activity and energy info. This can be used to ascertain what
* the controller has been up to, since the last sample.
*
* @param updateType Type of info, cached vs refreshed.
* @return a record with {@link BluetoothActivityEnergyInfo} or null if report is unavailable or
* unsupported
* @hide
* @deprecated use the asynchronous {@link #requestControllerActivityEnergyInfo(ResultReceiver)}
* instead.
*/
@Deprecated
@RequiresBluetoothConnectPermission
@RequiresPermission(allOf = {
android.Manifest.permission.BLUETOOTH_CONNECT,
android.Manifest.permission.BLUETOOTH_PRIVILEGED,
})
public BluetoothActivityEnergyInfo getControllerActivityEnergyInfo(int updateType) {
SynchronousResultReceiver receiver = new SynchronousResultReceiver();
requestControllerActivityEnergyInfo(receiver);
try {
SynchronousResultReceiver.Result result = receiver.awaitResult(1000);
if (result.bundle != null) {
return result.bundle.getParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY);
}
} catch (TimeoutException e) {
Log.e(TAG, "getControllerActivityEnergyInfo timed out");
}
return null;
}
/** /**
* Request the record of {@link BluetoothActivityEnergyInfo} object that * Request the record of {@link BluetoothActivityEnergyInfo} object that
* has the activity and energy info. This can be used to ascertain what * has the activity and energy info. This can be used to ascertain what