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

Commit b0fde04f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

BatteryService: Restore the original parcel order 

Append the dock extensions to the end of the parcel to preserve
compatibility with the original parcel format.

Change-Id: I92112e244ab85d6c93e8e5ebf37de8257af6413a
parent 0094b1e9

core/java/android/os/BatteryProperties.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.Parcelable; 
 */

 */

public class BatteryProperties implements Parcelable {

public class BatteryProperties implements Parcelable {

    public boolean chargerAcOnline;

    public boolean chargerAcOnline;

    public boolean chargerDockAcOnline;

    public boolean chargerUsbOnline;

    public boolean chargerUsbOnline;

    public boolean chargerWirelessOnline;

    public boolean chargerWirelessOnline;
@@ -37,6 +36,8 @@ public class BatteryProperties implements Parcelable { 
    public int batteryTemperature;

    public int batteryTemperature;

    public String batteryTechnology;

    public String batteryTechnology;





    /* Do NOT change the order of the standard parcel fields */

    public boolean chargerDockAcOnline;

    public boolean dockBatterySupported;

    public boolean dockBatterySupported;

    public int dockBatteryStatus;

    public int dockBatteryStatus;

    public int dockBatteryHealth;

    public int dockBatteryHealth;
@@ -55,7 +56,6 @@ public class BatteryProperties implements Parcelable { 




    private BatteryProperties(Parcel p) {

    private BatteryProperties(Parcel p) {

        chargerAcOnline = p.readInt() == 1 ? true : false;

        chargerAcOnline = p.readInt() == 1 ? true : false;

        chargerDockAcOnline = p.readInt() == 1 ? true : false;

        chargerUsbOnline = p.readInt() == 1 ? true : false;

        chargerUsbOnline = p.readInt() == 1 ? true : false;

        chargerWirelessOnline = p.readInt() == 1 ? true : false;

        chargerWirelessOnline = p.readInt() == 1 ? true : false;
@@ -69,6 +69,7 @@ public class BatteryProperties implements Parcelable { 
        batteryTemperature = p.readInt();

        batteryTemperature = p.readInt();

        batteryTechnology = p.readString();

        batteryTechnology = p.readString();





        chargerDockAcOnline = p.readInt() == 1 ? true : false;

        dockBatterySupported = p.readInt() == 1 ? true : false;

        dockBatterySupported = p.readInt() == 1 ? true : false;

        dockBatteryStatus = p.readInt();

        dockBatteryStatus = p.readInt();

        dockBatteryHealth = p.readInt();

        dockBatteryHealth = p.readInt();
@@ -83,7 +84,6 @@ public class BatteryProperties implements Parcelable { 




    public void writeToParcel(Parcel p, int flags) {

    public void writeToParcel(Parcel p, int flags) {

        p.writeInt(chargerAcOnline ? 1 : 0);

        p.writeInt(chargerAcOnline ? 1 : 0);

        p.writeInt(chargerDockAcOnline ? 1 : 0);

        p.writeInt(chargerUsbOnline ? 1 : 0);

        p.writeInt(chargerUsbOnline ? 1 : 0);

        p.writeInt(chargerWirelessOnline ? 1 : 0);

        p.writeInt(chargerWirelessOnline ? 1 : 0);
@@ -97,6 +97,7 @@ public class BatteryProperties implements Parcelable { 
        p.writeInt(batteryTemperature);

        p.writeInt(batteryTemperature);

        p.writeString(batteryTechnology);

        p.writeString(batteryTechnology);





        p.writeInt(chargerDockAcOnline ? 1 : 0);

        p.writeInt(dockBatterySupported ? 1 : 0);

        p.writeInt(dockBatterySupported ? 1 : 0);

        p.writeInt(dockBatteryStatus);

        p.writeInt(dockBatteryStatus);

        p.writeInt(dockBatteryHealth);

        p.writeInt(dockBatteryHealth);