commit e0206059a14c63cf0c60dd39195208b8aa99635a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 29 02:32:59 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 29 02:32:59 2020 +0000
tree 39a51614d510ab91e9f5d528357411465f06ad03
parent 6b398d9c3741c8c6664d740dddcb98d5fb8381e2
parent 28b79072a9eb54405c8d8f8922931c3ffa316014

Merge "Revert "Partial Revert of ag/10161061""

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 1a039dc..11d677a 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8367,7 +8367,7 @@
     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);

core/java/android/os/BatteryStatsManager.java

diff --git a/core/java/android/os/BatteryStatsManager.java b/core/java/android/os/BatteryStatsManager.java
index 152141e..f2e16b4 100644
--- a/core/java/android/os/BatteryStatsManager.java
+++ b/core/java/android/os/BatteryStatsManager.java
@@ -42,7 +42,7 @@
  */
 @SystemApi
 @SystemService(Context.BATTERY_STATS_SERVICE)
-public class BatteryStatsManager {
+public final class BatteryStatsManager {
     /**
      * Wifi states.
      *