Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b78430e1 authored by Kweku Adams's avatar Kweku Adams
Browse files

Updating batterystats report version. 

http://ag/3607190 changed the value of DATA_CONNECTION_OTHER, which
breaks parsing, so we need to update the report version.

Deferred job metrics added in http://ag/3628360.

Bug: 67013665
Bug: 70297451
Test: N/A
Change-Id: I3361733b10fb55b75d4ce618d8a87ab8c92e5836
parent 414189fe

core/java/android/os/BatteryStats.java

+4 −1
Original line number Diff line number Diff line
@@ -240,8 +240,11 @@ public abstract class BatteryStats implements Parcelable { 
     * New in version 30:

     *   - Uid.PROCESS_STATE_FOREGROUND_SERVICE only tracks

     *   ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE.

     * New in version 31:

     *   - New cellular network types.

     *   - Deferred job metrics.

     */

    static final int CHECKIN_VERSION = 30;

    static final int CHECKIN_VERSION = 31;



    /**

     * Old version, we hit 9 and ran out of room, need to remove.

core/proto/android/os/batterystats.proto

+5 −1
Original line number Diff line number Diff line
@@ -226,7 +226,11 @@ message SystemProto { 
      LTE = 13;

      EHRPD = 14;

      HSPAP = 15;

      OTHER = 16;

      GSM = 16;

      TD_SCDMA = 17;

      IWLAN = 18;

      LTE_CA = 19;

      OTHER = 20;

    };

    optional Name name = 1;

    optional TimerProto total = 2;