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

Commit 6e460c1f authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Add feature flag for streamlined battery stats" into main

parents 9cdebc98 b93aff99

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ java_library_static { 
        "ImmutabilityAnnotation",

        "securebox",

        "apache-commons-math",

        "power_optimization_flags_lib",

    ],

    javac_shard_size: 50,

    javacflags: [

services/core/java/com/android/server/am/BatteryStatsService.java

+5 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ import com.android.server.LocalServices; 
import com.android.server.Watchdog;

import com.android.server.net.BaseNetworkObserver;

import com.android.server.pm.UserManagerInternal;

import com.android.server.power.optimization.Flags;

import com.android.server.power.stats.BatteryExternalStatsWorker;

import com.android.server.power.stats.BatteryStatsImpl;

import com.android.server.power.stats.BatteryUsageStatsProvider;
@@ -2605,6 +2606,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        awaitCompletion();

        synchronized (mStats) {

            mStats.dumpConstantsLocked(pw);



            pw.println("Flags:");

            pw.println("    " + Flags.FLAG_STREAMLINED_BATTERY_STATS

                    + ": " + Flags.streamlinedBatteryStats());

        }

    }

services/core/java/com/android/server/power/Android.bp

0 → 100644
+12 −0
Original line number Diff line number Diff line 
aconfig_declarations {

    name: "power_optimization_flags",

    package: "com.android.server.power.optimization",

    srcs: [

        "stats/*.aconfig",

    ],

}



java_aconfig_library {

    name: "power_optimization_flags_lib",

    aconfig_declarations: "power_optimization_flags",

}

services/core/java/com/android/server/power/stats/flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.server.power.optimization"



flag {

    name: "streamlined_battery_stats"

    namespace: "power_optimization"

    description: "Feature flag for streamlined battery stats"

    bug: "285646152"

}