Merge "removed hidden Bluetooth permissions in BatteryStatsManager" (c4837b13) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStatsManager.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.annotation.TestApi;
		import android.bluetooth.annotations.RequiresBluetoothConnectPermission;
		import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission;
		import android.content.Context;
		import android.net.NetworkStack;
		import android.os.connectivity.CellularBatteryStats;
		@@ -523,8 +521,6 @@ public final class BatteryStatsManager {
		* @param reason why Bluetooth has been turned on
		* @param packageName package responsible for this change
		*/
		@RequiresLegacyBluetoothAdminPermission
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void reportBluetoothOn(int uid, int reason, @NonNull String packageName) {
		try {
		@@ -541,8 +537,6 @@ public final class BatteryStatsManager {
		* @param reason why Bluetooth has been turned on
		* @param packageName package responsible for this change
		*/
		@RequiresLegacyBluetoothAdminPermission
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void reportBluetoothOff(int uid, int reason, @NonNull String packageName) {
		try {