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

Commit ddefe02f authored by Milo Sredkov's avatar Milo Sredkov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "bscamera3" 

* changes:
  Add per-UID measured camera stats
  Add measured camera stats to BatteryUsageStats
  Collect camera power consumption into BatteryStats
parents 41e9b2fb 853fd9ba

core/java/android/os/BatteryStats.java

+19 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,16 @@ public abstract class BatteryStats { 
                @BatteryConsumer.ProcessState int processState);







        /**

         * Returns the battery consumption (in microcoulombs) of UID's camera usage, derived from

         * on-device power measurement data.

         * Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable.

         *

         * {@hide}

         */

        public abstract long getCameraEnergyConsumptionUC();



        /**

         * Returns the battery consumption (in microcoulombs) used by this uid for each

         * {@link android.hardware.power.stats.EnergyConsumer.ordinal} of (custom) energy consumer
@@ -2920,6 +2930,15 @@ public abstract class BatteryStats { 
     */

    public abstract long getWifiEnergyConsumptionUC();



    /**

     * Returns the battery consumption (in microcoulombs) of camera, derived from on

     * device power measurement data.

     * Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable.

     *

     * {@hide}

     */

    public abstract long getCameraEnergyConsumptionUC();



    /**

     * Returns the battery consumption (in microcoulombs) that each

     * {@link android.hardware.power.stats.EnergyConsumer.ordinal} of (custom) energy consumer

core/java/com/android/internal/power/EnergyConsumerStats.java

+3 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ public class EnergyConsumerStats { 
    public static final int POWER_BUCKET_BLUETOOTH = 5;

    public static final int POWER_BUCKET_GNSS = 6;

    public static final int POWER_BUCKET_MOBILE_RADIO = 7;

    public static final int NUMBER_STANDARD_POWER_BUCKETS = 8; // Buckets above this are custom.

    public static final int POWER_BUCKET_CAMERA = 8;

    public static final int NUMBER_STANDARD_POWER_BUCKETS = 9; // Buckets above this are custom.



    @IntDef(prefix = {"POWER_BUCKET_"}, value = {

            POWER_BUCKET_UNKNOWN,
@@ -70,6 +71,7 @@ public class EnergyConsumerStats { 
            POWER_BUCKET_BLUETOOTH,

            POWER_BUCKET_GNSS,

            POWER_BUCKET_MOBILE_RADIO,

            POWER_BUCKET_CAMERA,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface StandardPowerBucket {

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ java_library_static { 
        "android.hardware.ir-V1-java",

        "android.hardware.rebootescrow-V1-java",

        "android.hardware.soundtrigger-V2.3-java",

        "android.hardware.power.stats-V1-java",

        "android.hardware.power.stats-V2-java",

        "android.hardware.power-V4-java",

        "android.hidl.manager-V1.2-java",

        "icu4j_calendar_astronomer",

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

+11 −0
Original line number Diff line number Diff line
@@ -710,6 +710,11 @@ public class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStat 
                if (gnssChargeUC != EnergyConsumerSnapshot.UNAVAILABLE) {

                    mStats.updateGnssEnergyConsumerStatsLocked(gnssChargeUC, elapsedRealtime);

                }



                final long cameraChargeUC = energyConsumerDeltas.cameraChargeUC;

                if (cameraChargeUC != EnergyConsumerSnapshot.UNAVAILABLE) {

                    mStats.updateCameraEnergyConsumerStatsLocked(cameraChargeUC, elapsedRealtime);

                }

            }

            // Inform mStats about each applicable custom energy bucket.

            if (energyConsumerDeltas != null
@@ -904,6 +909,9 @@ public class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStat 
                case EnergyConsumerType.WIFI:

                    buckets[EnergyConsumerStats.POWER_BUCKET_WIFI] = true;

                    break;

                case EnergyConsumerType.CAMERA:

                    buckets[EnergyConsumerStats.POWER_BUCKET_CAMERA] = true;

                    break;

            }

        }

        return buckets;
@@ -955,6 +963,9 @@ public class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStat 
        if ((flags & UPDATE_WIFI) != 0) {

            addEnergyConsumerIdLocked(energyConsumerIds, EnergyConsumerType.WIFI);

        }

        if ((flags & UPDATE_CAMERA) != 0) {

            addEnergyConsumerIdLocked(energyConsumerIds, EnergyConsumerType.CAMERA);

        }



        if (energyConsumerIds.size() == 0) {

            return null;

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

+85 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class BatteryStatsImpl extends BatteryStats { 
    // TODO: remove "tcp" from network methods, since we measure total stats.















    // Current on-disk Parcel version. Must be updated when the format of the parcelable changes













    public static final int VERSION = 210;













    public static final int VERSION = 211;





























    // The maximum number of names wakelocks we will keep track of















    // per uid; once the limit is reached, we batch the remaining wakelocks










@@ -649,10 +649,12 @@ public class BatteryStatsImpl extends BatteryStats {













        int UPDATE_BT = 0x08;















        int UPDATE_RPM = 0x10;















        int UPDATE_DISPLAY = 0x20;













        int RESET = 0x40;













        int UPDATE_CAMERA = 0x40;













        int RESET = 0x80;





























        int UPDATE_ALL =













                UPDATE_CPU | UPDATE_WIFI | UPDATE_RADIO | UPDATE_BT | UPDATE_RPM | UPDATE_DISPLAY;













                UPDATE_CPU | UPDATE_WIFI | UPDATE_RADIO | UPDATE_BT | UPDATE_RPM | UPDATE_DISPLAY













                        | UPDATE_CAMERA;





























        int UPDATE_ON_PROC_STATE_CHANGE = UPDATE_WIFI | UPDATE_RADIO | UPDATE_BT;























@@ -665,6 +667,7 @@ public class BatteryStatsImpl extends BatteryStats {













                UPDATE_BT,















                UPDATE_RPM,















                UPDATE_DISPLAY,













                UPDATE_CAMERA,















                UPDATE_ALL,















        })















        @Retention(RetentionPolicy.SOURCE)










@@ -6244,6 +6247,8 @@ public class BatteryStatsImpl extends BatteryStats {













        }















        getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)















                .noteCameraTurnedOnLocked(elapsedRealtimeMs);

























        scheduleSyncExternalStatsLocked("camera-on", ExternalStatsSync.UPDATE_CAMERA);















    }





























    @GuardedBy("this")









@@ -6259,6 +6264,8 @@ public class BatteryStatsImpl extends BatteryStats {













        }















        getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)















                .noteCameraTurnedOffLocked(elapsedRealtimeMs);

























        scheduleSyncExternalStatsLocked("camera-off", ExternalStatsSync.UPDATE_CAMERA);















    }





























    @GuardedBy("this")









@@ -6273,6 +6280,8 @@ public class BatteryStatsImpl extends BatteryStats {













                uid.noteResetCameraLocked(elapsedRealtimeMs);















            }















        }

























        scheduleSyncExternalStatsLocked("camera-reset", ExternalStatsSync.UPDATE_CAMERA);















    }





























    @GuardedBy("this")










@@ -7414,6 +7423,12 @@ public class BatteryStatsImpl extends BatteryStats {













        return getPowerBucketConsumptionUC(EnergyConsumerStats.POWER_BUCKET_WIFI);















    }



























    @GuardedBy("this")













    @Override













    public long getCameraEnergyConsumptionUC() {













        return getPowerBucketConsumptionUC(EnergyConsumerStats.POWER_BUCKET_CAMERA);













    }



























    /**















     * Returns the consumption (in microcoulombs) that the given standard power bucket consumed.















     * Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable










@@ -8427,6 +8442,12 @@ public class BatteryStatsImpl extends BatteryStats {













                    processState);















        }



























        @GuardedBy("mBsi")













        @Override













        public long getCameraEnergyConsumptionUC() {













            return getEnergyConsumptionUC(EnergyConsumerStats.POWER_BUCKET_CAMERA);













        }



























        /**















         * Gets the minimum of the uid's foreground activity time and its PROCESS_STATE_TOP time















         * since last marked. Also sets the mark time for both these timers.










@@ -8477,6 +8498,20 @@ public class BatteryStatsImpl extends BatteryStats {













            return gnssTimeUs;















        }



























        /**













         * Gets the uid's time spent using the camera since last marked. Also sets the mark time for













         * the camera timer.













         */













        private long markCameraTimeUs(long elapsedRealtimeMs) {













            final StopwatchTimer timer = mCameraTurnedOnTimer;













            if (timer == null) {













                return 0;













            }













            final long cameraTimeUs = timer.getTimeSinceMarkLocked(elapsedRealtimeMs * 1000);













            timer.setMark(elapsedRealtimeMs);













            return cameraTimeUs;













        }



























        public StopwatchTimer createAudioTurnedOnTimerLocked() {















            if (mAudioTurnedOnTimer == null) {















                mAudioTurnedOnTimer = new StopwatchTimer(mBsi.mClock, Uid.this, AUDIO_TURNED_ON,










@@ -12901,6 +12936,53 @@ public class BatteryStatsImpl extends BatteryStats {













                gnssTimeUsArray, 0, elapsedRealtimeMs);















    }



























    /**













     * Accumulate camera charge consumption and distribute it to the correct state and the apps.













     *













     * @param chargeUC amount of charge (microcoulombs) used by the camera since this was last













     *         called.













     */













    @GuardedBy("this")













    public void updateCameraEnergyConsumerStatsLocked(long chargeUC, long elapsedRealtimeMs) {













        if (DEBUG_ENERGY) Slog.d(TAG, "Updating camera stats: " + chargeUC);













        if (mGlobalEnergyConsumerStats == null) {













            return;













        }

























        if (!mOnBatteryInternal || chargeUC <= 0) {













            // There's nothing further to update.













            return;













        }

























        if (mIgnoreNextExternalStats) {













            // Although under ordinary resets we won't get here, and typically a new sync will













            // happen right after the reset, strictly speaking we need to set all mark times to now.













            final int uidStatsSize = mUidStats.size();













            for (int i = 0; i < uidStatsSize; i++) {













                final Uid uid = mUidStats.valueAt(i);













                uid.markCameraTimeUs(elapsedRealtimeMs);













            }













            return;













        }

























        mGlobalEnergyConsumerStats.updateStandardBucket(













                EnergyConsumerStats.POWER_BUCKET_CAMERA, chargeUC);

























        // Collect the per uid time since mark so that we can normalize power.













        final SparseDoubleArray cameraTimeUsArray = new SparseDoubleArray();

























        // Note: Iterating over all UIDs may be suboptimal.













        final int uidStatsSize = mUidStats.size();













        for (int i = 0; i < uidStatsSize; i++) {













            final Uid uid = mUidStats.valueAt(i);













            final long cameraTimeUs = uid.markCameraTimeUs(elapsedRealtimeMs);













            if (cameraTimeUs == 0) continue;













            cameraTimeUsArray.put(uid.getUid(), (double) cameraTimeUs);













        }













        distributeEnergyToUidsLocked(EnergyConsumerStats.POWER_BUCKET_CAMERA, chargeUC,













                cameraTimeUsArray, 0, elapsedRealtimeMs);













    }



























    /**















     * Accumulate Custom power bucket charge, globally and for each app.















     *