Merge "Deprecate BatteryStatsHelper and BatterySipper" into sc-dev

core/java/com/android/internal/os/BatterySipper.java

@@ -23,7 +23,10 @@ import java.util.List;
 
 /**
  * Contains power usage of an application, system service, or hardware type.
+ *
+ * @deprecated Please use BatteryStatsManager.getBatteryUsageStats instead.
  */
+@Deprecated
 public class BatterySipper implements Comparable<BatterySipper> {
     @UnsupportedAppUsage
     public int userId;

core/java/com/android/internal/os/BatteryStatsHelper.java

@@ -59,7 +59,10 @@ import java.util.List;
  *
  * The caller must initialize this class as soon as activity object is ready to use (for example, in
  * onAttach() for Fragment), call create() in onCreate() and call destroy() in onDestroy().
+ *
+ * @deprecated Please use BatteryStatsManager.getBatteryUsageStats instead.
  */
+@Deprecated
 public class BatteryStatsHelper {
     static final boolean DEBUG = false;