diff options
3 files changed, 2 insertions, 38 deletions
diff --git a/core/java/android/os/BatteryStatsManager.java b/core/java/android/os/BatteryStatsManager.java index 071bdea5e3ac..955fad3d1a48 100644 --- a/core/java/android/os/BatteryStatsManager.java +++ b/core/java/android/os/BatteryStatsManager.java @@ -520,14 +520,10 @@ public final class BatteryStatsManager { * @param uid calling package uid * @param reason why Bluetooth has been turned on * @param packageName package responsible for this change + * @Deprecated Bluetooth self report its state and no longer call this */ @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOn(int uid, int reason, @NonNull String packageName) { - try { - mBatteryStats.noteBluetoothOn(uid, reason, packageName); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); - } } /** @@ -536,14 +532,10 @@ public final class BatteryStatsManager { * @param uid calling package uid * @param reason why Bluetooth has been turned on * @param packageName package responsible for this change + * @Deprecated Bluetooth self report its state and no longer call this */ @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOff(int uid, int reason, @NonNull String packageName) { - try { - mBatteryStats.noteBluetoothOff(uid, reason, packageName); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); - } } /** diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl index 629a1b36b9e6..ee2084722cc5 100644 --- a/core/java/com/android/internal/app/IBatteryStats.aidl +++ b/core/java/com/android/internal/app/IBatteryStats.aidl @@ -145,8 +145,6 @@ interface IBatteryStats { long getAwakeTimeBattery(); long getAwakeTimePlugged(); - void noteBluetoothOn(int uid, int reason, String packageName); - void noteBluetoothOff(int uid, int reason, String packageName); void noteBleScanStarted(in WorkSource ws, boolean isUnoptimized); void noteBleScanStopped(in WorkSource ws, boolean isUnoptimized); void noteBleScanReset(); diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 8439a7d9b743..5ae06c065204 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -1982,32 +1982,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub } } - /** - * Bluetooth on stat logging - */ - public void noteBluetoothOn(int uid, int reason, String packageName) { - if (Binder.getCallingPid() != Process.myPid()) { - mContext.enforcePermission(android.Manifest.permission.BLUETOOTH_CONNECT, - Binder.getCallingPid(), uid, null); - } - FrameworkStatsLog.write_non_chained(FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED, - uid, null, FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__ENABLED, - reason, packageName); - } - - /** - * Bluetooth off stat logging - */ - public void noteBluetoothOff(int uid, int reason, String packageName) { - if (Binder.getCallingPid() != Process.myPid()) { - mContext.enforcePermission(android.Manifest.permission.BLUETOOTH_CONNECT, - Binder.getCallingPid(), uid, null); - } - FrameworkStatsLog.write_non_chained(FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED, - uid, null, FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__DISABLED, - reason, packageName); - } - @Override public void noteBleScanStarted(final WorkSource ws, final boolean isUnoptimized) { enforceCallingPermission(); |