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

Commit 0ed66a41 authored by jackqdyulei's avatar jackqdyulei Committed by Lei Yu
Browse files

Add dump log for BatteryTip. 

Since BatteryTipLoader will dump all BatteryTips, so we only need
to add toString() for it.

Bug: 74246970
Test: RunSettingsRoboTests
Change-Id: I0a89c4ac06d107274d47f8b4b66867373c062c1b
parent 2e79a7cc

src/com/android/settings/fuelgauge/batterytip/AppInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ public class AppInfo implements Comparable<AppInfo>, Parcelable { 
        dest.writeLong(screenOnTimeMs);

    }



    @Override

    public String toString() {

        return "packageName=" + packageName + ",anomalyType=" + anomalyType + ",screenTime="

                + screenOnTimeMs;

    }



    public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {

        public AppInfo createFromParcel(Parcel in) {

            return new AppInfo(in);

src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java

+5 −0
Original line number Diff line number Diff line
@@ -158,4 +158,9 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
    public int compareTo(BatteryTip o) {

        return TIP_ORDER.get(mType) - TIP_ORDER.get(o.mType);

    }



    @Override

    public String toString() {

        return "type=" + mType + " state=" + mState;

    }

}

src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java

+13 −0
Original line number Diff line number Diff line
@@ -86,6 +86,19 @@ public class HighUsageTip extends BatteryTip { 
        return mHighUsageAppList;

    }



    @Override

    public String toString() {

        final StringBuilder stringBuilder = new StringBuilder(super.toString());

        stringBuilder.append(" {");

        for (int i = 0, size = mHighUsageAppList.size(); i < size; i++) {

            final AppInfo appInfo = mHighUsageAppList.get(i);

            stringBuilder.append(" " + appInfo.toString() + " ");

        }

        stringBuilder.append('}');



        return stringBuilder.toString();

    }



    public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {

        public BatteryTip createFromParcel(Parcel in) {

            return new HighUsageTip(in);

src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java

+13 −0
Original line number Diff line number Diff line
@@ -97,6 +97,19 @@ public class RestrictAppTip extends BatteryTip { 
        return mRestrictAppList;

    }



    @Override

    public String toString() {

        final StringBuilder stringBuilder = new StringBuilder(super.toString());

        stringBuilder.append(" {");

        for (int i = 0, size = mRestrictAppList.size(); i < size; i++) {

            final AppInfo appInfo = mRestrictAppList.get(i);

            stringBuilder.append(" " + appInfo.toString() + " ");

        }

        stringBuilder.append('}');



        return stringBuilder.toString();

    }



    @Override

    public void writeToParcel(Parcel dest, int flags) {

        super.writeToParcel(dest, flags);

tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java

+8 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class BatteryTipTest { 
    }



    @Test

    public void testBuildPreference() {

    public void buildPreference() {

        final Preference preference = mBatteryTip.buildPreference(mContext);



        assertThat(preference.getTitle()).isEqualTo(TITLE);
@@ -61,7 +61,7 @@ public class BatteryTipTest { 
    }



    @Test

    public void testParcelable() {

    public void parcelable() {

        final BatteryTip batteryTip = new TestBatteryTip();



        Parcel parcel = Parcel.obtain();
@@ -76,7 +76,7 @@ public class BatteryTipTest { 
    }



    @Test

    public void testTipOrder_orderUnique() {

    public void tipOrder_orderUnique() {

        final List<Integer> orders = new ArrayList<>();

        for (int i = 0, size = BatteryTip.TIP_ORDER.size(); i < size; i++) {

            orders.add(BatteryTip.TIP_ORDER.valueAt(i));
@@ -85,6 +85,11 @@ public class BatteryTipTest { 
        assertThat(orders).containsNoDuplicates();

    }



    @Test

    public void toString_containBatteryTipData() {

        assertThat(mBatteryTip.toString()).isEqualTo("type=6 state=0");

    }



    /**

     * Used to test the non abstract methods in {@link TestBatteryTip}

     */