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

Commit a78d18a7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3463668, 3464926, 3464927, 3464663, 3464895, 3464928,... 

Merge cherrypicks of [3463668, 3464926, 3464927, 3464663, 3464895, 3464928, 3464896, 3464664, 3464665, 3464666, 3464492, 3464456, 3464929, 3465492, 3465473] into oc-m2-release

Change-Id: Iba94fca4f61da645d68a4ac14b0f280a170d00d3
parents 5f6df8aa 99ce64c9

src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java

+1 −2
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements 


    @Override

    public int getMetricsCategory() {

        //TODO(b/37681923): add correct metrics category

        return 0;

        return MetricsProto.MetricsEvent.FUELGAUGE_ANOMALY_DETAIL;

    }



    void refreshUi() {

src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.DialogInterface; 
import android.os.Bundle;

import android.support.annotation.VisibleForTesting;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
@@ -79,8 +80,7 @@ public class AnomalyDialogFragment extends InstrumentedDialogFragment implements 


    @Override

    public int getMetricsCategory() {

        // TODO(b/37681923): add anomaly metric id

        return 0;

        return MetricsProto.MetricsEvent.DIALOG_HANDLE_ANOMALY;

    }



    @Override