From 28b79072a9eb54405c8d8f8922931c3ffa316014 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 29 Jan 2020 00:51:25 +0000 Subject: [PATCH] Revert "Partial Revert of ag/10161061" This reverts commit 81d7cece57540d61ea16d2d33f253b474d60a963. Reason for revert: The telephony unit tests are fixed. Bug: 148282682 Change-Id: Ib835f0abf4faf33ea3a54420c84c1f8383d663c3 --- api/system-current.txt | 2 +- core/java/android/os/BatteryStatsManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 9cc7f08a655bf..b4825bfe36954 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8411,7 +8411,7 @@ package android.os { method @NonNull public android.os.BatterySaverPolicyConfig.Builder setLocationMode(int); } - public class BatteryStatsManager { + public final class BatteryStatsManager { method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.os.connectivity.CellularBatteryStats getCellularBatteryStats(); method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.os.connectivity.WifiBatteryStats getWifiBatteryStats(); method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportFullWifiLockAcquiredFromSource(@NonNull android.os.WorkSource); diff --git a/core/java/android/os/BatteryStatsManager.java b/core/java/android/os/BatteryStatsManager.java index 152141edb52d8..f2e16b46422f2 100644 --- a/core/java/android/os/BatteryStatsManager.java +++ b/core/java/android/os/BatteryStatsManager.java @@ -42,7 +42,7 @@ import java.lang.annotation.RetentionPolicy; */ @SystemApi @SystemService(Context.BATTERY_STATS_SERVICE) -public class BatteryStatsManager { +public final class BatteryStatsManager { /** * Wifi states. *