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

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

Merge "Remove flag... 

Merge "Remove flag com.android.server.power.optimization.disable_system_service_power_attr" into main
parents e73e867d 85f720f9

core/java/android/os/BatteryStats.java

+0 −20
Original line number Diff line number Diff line
@@ -802,12 +802,6 @@ public abstract class BatteryStats { 
        @UnsupportedAppUsage

        public abstract ArrayMap<String, ? extends Pkg> getPackageStats();



        /**

         * Returns the proportion of power consumed by the System Service

         * calls made by this UID.

         */

        public abstract double getProportionalSystemServiceUsage();



        public abstract ControllerActivityCounter getWifiControllerActivity();

        public abstract ControllerActivityCounter getBluetoothControllerActivity();

        public abstract ControllerActivityCounter getModemControllerActivity();
@@ -3447,20 +3441,6 @@ public abstract class BatteryStats { 
     */

    public abstract int getDischargeAmountScreenDozeSinceCharge();



    /**

     * Returns the approximate CPU time (in microseconds) spent by the system server handling

     * incoming service calls from apps.  The result is returned as an array of longs,

     * organized as a sequence like this:

     * <pre>

     *     cluster1-speed1, cluster1-speed2, ..., cluster2-speed1, cluster2-speed2, ...

     * </pre>

     *

     * @see com.android.internal.os.CpuScalingPolicies#getPolicies

     * @see com.android.internal.os.CpuScalingPolicies#getFrequencies

     */

    @Nullable

    public abstract long[] getSystemServiceTimeAtCpuSpeeds();



    /**

     * Returns the total, last, or current battery uptime in microseconds.

     *

services/core/java/android/os/BatteryStatsInternal.java

+0 −18
Original line number Diff line number Diff line
@@ -19,12 +19,8 @@ package android.os; 
import android.annotation.IntDef;

import android.net.Network;



import com.android.internal.os.BinderCallsStats;

import com.android.server.power.stats.SystemServerCpuThreadReader.SystemServiceCpuThreadTimes;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Collection;

import java.util.List;



/**
@@ -67,9 +63,6 @@ public abstract class BatteryStatsInternal { 
     */

    public abstract String[] getMobileIfaces();



    /** Returns CPU times for system server thread groups. */

    public abstract SystemServiceCpuThreadTimes getSystemServiceCpuThreadTimes();



    /**

     * Returns BatteryUsageStats, which contains power attribution data on a per-subsystem

     * and per-UID basis.
@@ -108,17 +101,6 @@ public abstract class BatteryStatsInternal { 
     */

    public abstract void noteCpuWakingBluetoothProxyPacket(int uid, long elapsedMillis);



    /**

     * Informs battery stats of binder stats for the given work source UID.

     */

    public abstract void noteBinderCallStats(int workSourceUid, long incrementalBinderCallCount,

            Collection<BinderCallsStats.CallStat> callStats);



    /**

     * Informs battery stats of native thread IDs of threads taking incoming binder calls.

     */

    public abstract void noteBinderThreadNativeIds(int[] binderThreadNativeTids);



    /**

     * Reports a sound trigger recognition event that may have woken up the CPU.

     * @param elapsedMillis The time when the event happened in the elapsed timebase.

services/core/java/com/android/server/BinderCallsStatsService.java

+0 −19
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.database.ContentObserver;

import android.net.Uri;

import android.os.BatteryStatsInternal;

import android.os.Binder;

import android.os.ParcelFileDescriptor;

import android.os.Process;
@@ -59,7 +58,6 @@ import com.android.internal.util.DumpUtils; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Collection;

import java.util.List;



public class BinderCallsStatsService extends Binder {
@@ -288,23 +286,6 @@ public class BinderCallsStatsService extends Binder { 
                        CachedDeviceState.Readonly.class);

                mBinderCallsStats.setDeviceState(deviceState);



                if (!com.android.server.power.optimization.Flags.disableSystemServicePowerAttr()) {

                    BatteryStatsInternal batteryStatsInternal = getLocalService(

                            BatteryStatsInternal.class);

                    mBinderCallsStats.setCallStatsObserver(new BinderInternal.CallStatsObserver() {

                        @Override

                        public void noteCallStats(int workSourceUid, long incrementalCallCount,

                                Collection<BinderCallsStats.CallStat> callStats) {

                            batteryStatsInternal.noteBinderCallStats(workSourceUid,

                                    incrementalCallCount, callStats);

                        }



                        @Override

                        public void noteBinderThreadNativeIds(int[] binderThreadNativeTids) {

                            batteryStatsInternal.noteBinderThreadNativeIds(binderThreadNativeTids);

                        }

                    });

                }

                // It needs to be called before mService.systemReady to make sure the observer is

                // initialized before installing it.

                mWorkSourceProvider.systemReady(getContext());

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

+0 −30
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ import com.android.internal.R; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.IBatteryStats;

import com.android.internal.os.BinderCallsStats;

import com.android.internal.os.Clock;

import com.android.internal.os.CpuScalingPolicies;

import com.android.internal.os.CpuScalingPolicyReader;
@@ -117,7 +116,6 @@ import com.android.internal.os.RpmStats; 
import com.android.internal.util.DumpUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.ParseUtils;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.modules.utils.build.SdkLevel;

import com.android.net.module.util.NetworkCapabilitiesUtils;

import com.android.server.LocalServices;
@@ -134,7 +132,6 @@ import com.android.server.power.stats.PowerAttributor; 
import com.android.server.power.stats.PowerStatsScheduler;

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

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

import com.android.server.power.stats.SystemServerCpuThreadReader.SystemServiceCpuThreadTimes;

import com.android.server.power.stats.processor.MultiStatePowerAttributor;

import com.android.server.power.stats.wakeups.CpuWakeupStats;
@@ -150,7 +147,6 @@ import java.nio.charset.CharsetDecoder; 
import java.nio.charset.CodingErrorAction;

import java.nio.charset.StandardCharsets;

import java.util.Arrays;

import java.util.Collection;

import java.util.Comparator;

import java.util.HashMap;

import java.util.List;
@@ -395,10 +391,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        mStats.setExternalStatsSyncLocked(mWorker);

        mStats.setRadioScanningTimeoutLocked(mContext.getResources().getInteger(

                com.android.internal.R.integer.config_radioScanningTimeout) * 1000L);

        if (!Flags.disableSystemServicePowerAttr()) {

            mStats.startTrackingSystemServerCpuTime();

        }



        mPowerStatsStore = new PowerStatsStore(systemDir, mHandler);

        mPowerAttributor = new MultiStatePowerAttributor(mContext, mPowerStatsStore, mPowerProfile,

                mCpuScalingPolicies, () -> mStats.getBatteryCapacity());
@@ -642,11 +634,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
            return mStats.getMobileIfaces().clone();

        }



        @Override

        public SystemServiceCpuThreadTimes getSystemServiceCpuThreadTimes() {

            return mStats.getSystemServiceCpuThreadTimes();

        }



        @Override

        public List<BatteryUsageStats> getBatteryUsageStats(List<BatteryUsageStatsQuery> queries) {

            return BatteryStatsService.this.getBatteryUsageStats(queries);
@@ -696,23 +683,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
            noteCpuWakingActivity(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH, elapsedMillis, uid);

        }



        @Override

        public void noteBinderCallStats(int workSourceUid, long incrementatCallCount,

                Collection<BinderCallsStats.CallStat> callStats) {

            synchronized (BatteryStatsService.this.mLock) {

                mHandler.sendMessage(PooledLambda.obtainMessage(

                        mStats::noteBinderCallStats, workSourceUid, incrementatCallCount, callStats,

                        SystemClock.elapsedRealtime(), SystemClock.uptimeMillis()));

            }

        }



        @Override

        public void noteBinderThreadNativeIds(int[] binderThreadNativeTids) {

            synchronized (BatteryStatsService.this.mLock) {

                mStats.noteBinderThreadNativeIds(binderThreadNativeTids);

            }

        }



        @Override

        public void noteWakingSoundTrigger(long elapsedMillis, int uid) {

            noteCpuWakingActivity(CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER, elapsedMillis, uid);

services/core/java/com/android/server/power/stats/BatteryStatsImpl.java

+1 −362

File changed.

Preview size limit exceeded, changes collapsed.