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

Commit c1b02f71 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11890778 from 1baf5540 to 24Q3-release

Change-Id: I36425c9bcbfe2874f47dc078bc9e45d6f687fa94
parents b0c08fdf 1baf5540
Loading
Loading
Loading
Loading
+13 −3
Original line number Original line Diff line number Diff line
@@ -1948,6 +1948,10 @@ public abstract class BatteryStats {


        public static final int SETTLE_TO_ZERO_STATES = 0xffff0000 & ~MOST_INTERESTING_STATES;
        public static final int SETTLE_TO_ZERO_STATES = 0xffff0000 & ~MOST_INTERESTING_STATES;


        // STATES bits that are used for Power Stats tracking
        public static final int IMPORTANT_FOR_POWER_STATS_STATES =
                STATE_GPS_ON_FLAG | STATE_SENSOR_ON_FLAG | STATE_AUDIO_ON_FLAG;

        @UnsupportedAppUsage
        @UnsupportedAppUsage
        public int states;
        public int states;


@@ -1988,6 +1992,10 @@ public abstract class BatteryStats {


        public static final int SETTLE_TO_ZERO_STATES2 = 0xffff0000 & ~MOST_INTERESTING_STATES2;
        public static final int SETTLE_TO_ZERO_STATES2 = 0xffff0000 & ~MOST_INTERESTING_STATES2;


        // STATES2 bits that are used for Power Stats tracking
        public static final int IMPORTANT_FOR_POWER_STATS_STATES2 =
                STATE2_VIDEO_ON_FLAG | STATE2_FLASHLIGHT_FLAG | STATE2_CAMERA_FLAG;

        @UnsupportedAppUsage
        @UnsupportedAppUsage
        public int states2;
        public int states2;


@@ -2053,6 +2061,8 @@ public abstract class BatteryStats {
        public static final int EVENT_WAKEUP_AP = 0x0013;
        public static final int EVENT_WAKEUP_AP = 0x0013;
        // Event for reporting that a specific partial wake lock has been held for a long duration.
        // Event for reporting that a specific partial wake lock has been held for a long duration.
        public static final int EVENT_LONG_WAKE_LOCK = 0x0014;
        public static final int EVENT_LONG_WAKE_LOCK = 0x0014;
        // Event for reporting change of some device states, triggered by a specific UID
        public static final int EVENT_STATE_CHANGE = 0x0015;


        // Number of event types.
        // Number of event types.
        public static final int EVENT_COUNT = 0x0016;
        public static final int EVENT_COUNT = 0x0016;
@@ -3066,13 +3076,13 @@ public abstract class BatteryStats {
    public static final String[] HISTORY_EVENT_NAMES = new String[] {
    public static final String[] HISTORY_EVENT_NAMES = new String[] {
            "null", "proc", "fg", "top", "sync", "wake_lock_in", "job", "user", "userfg", "conn",
            "null", "proc", "fg", "top", "sync", "wake_lock_in", "job", "user", "userfg", "conn",
            "active", "pkginst", "pkgunin", "alarm", "stats", "pkginactive", "pkgactive",
            "active", "pkginst", "pkgunin", "alarm", "stats", "pkginactive", "pkgactive",
            "tmpwhitelist", "screenwake", "wakeupap", "longwake", "est_capacity"
            "tmpwhitelist", "screenwake", "wakeupap", "longwake", "est_capacity", "state"
    };
    };


    public static final String[] HISTORY_EVENT_CHECKIN_NAMES = new String[] {
    public static final String[] HISTORY_EVENT_CHECKIN_NAMES = new String[] {
            "Enl", "Epr", "Efg", "Etp", "Esy", "Ewl", "Ejb", "Eur", "Euf", "Ecn",
            "Enl", "Epr", "Efg", "Etp", "Esy", "Ewl", "Ejb", "Eur", "Euf", "Ecn",
            "Eac", "Epi", "Epu", "Eal", "Est", "Eai", "Eaa", "Etw",
            "Eac", "Epi", "Epu", "Eal", "Est", "Eai", "Eaa", "Etw",
            "Esw", "Ewa", "Elw", "Eec"
            "Esw", "Ewa", "Elw", "Eec", "Esc"
    };
    };


    @FunctionalInterface
    @FunctionalInterface
@@ -3087,7 +3097,7 @@ public abstract class BatteryStats {
            sUidToString, sUidToString, sUidToString, sUidToString, sUidToString, sUidToString,
            sUidToString, sUidToString, sUidToString, sUidToString, sUidToString, sUidToString,
            sUidToString, sUidToString, sUidToString, sUidToString, sUidToString, sIntToString,
            sUidToString, sUidToString, sUidToString, sUidToString, sUidToString, sIntToString,
            sUidToString, sUidToString, sUidToString, sUidToString, sUidToString, sUidToString,
            sUidToString, sUidToString, sUidToString, sUidToString, sUidToString, sUidToString,
            sUidToString, sUidToString, sUidToString, sIntToString
            sUidToString, sUidToString, sUidToString, sIntToString, sUidToString
    };
    };


    /**
    /**
+34 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,10 @@


package com.android.internal.os;
package com.android.internal.os;


import static android.os.BatteryStats.HistoryItem.EVENT_FLAG_FINISH;
import static android.os.BatteryStats.HistoryItem.EVENT_FLAG_START;
import static android.os.BatteryStats.HistoryItem.EVENT_STATE_CHANGE;

import android.annotation.NonNull;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Nullable;
import android.os.BatteryConsumer;
import android.os.BatteryConsumer;
@@ -1448,6 +1452,21 @@ public class BatteryStatsHistory {
        }
        }
    }
    }


    /**
     * Records an event when some state flag changes to true.
     */
    public void recordStateStartEvent(long elapsedRealtimeMs, long uptimeMs, int stateFlags,
            int uid, String name) {
        synchronized (this) {
            mHistoryCur.states |= stateFlags;
            mHistoryCur.eventCode = EVENT_STATE_CHANGE | EVENT_FLAG_START;
            mHistoryCur.eventTag = mHistoryCur.localEventTag;
            mHistoryCur.eventTag.uid = uid;
            mHistoryCur.eventTag.string = name;
            writeHistoryItem(elapsedRealtimeMs, uptimeMs);
        }
    }

    /**
    /**
     * Records an event when some state flag changes to false.
     * Records an event when some state flag changes to false.
     */
     */
@@ -1458,6 +1477,21 @@ public class BatteryStatsHistory {
        }
        }
    }
    }


    /**
     * Records an event when some state flag changes to false.
     */
    public void recordStateStopEvent(long elapsedRealtimeMs, long uptimeMs, int stateFlags,
            int uid, String name) {
        synchronized (this) {
            mHistoryCur.states &= ~stateFlags;
            mHistoryCur.eventCode = EVENT_STATE_CHANGE | EVENT_FLAG_FINISH;
            mHistoryCur.eventTag = mHistoryCur.localEventTag;
            mHistoryCur.eventTag.uid = uid;
            mHistoryCur.eventTag.string = name;
            writeHistoryItem(elapsedRealtimeMs, uptimeMs);
        }
    }

    /**
    /**
     * Records an event when some state flags change to true and some to false.
     * Records an event when some state flags change to true and some to false.
     */
     */
+1 −0
Original line number Original line Diff line number Diff line
@@ -8617,6 +8617,7 @@ public class AudioManager {
    @SystemApi
    @SystemApi
    @NonNull
    @NonNull
    @RequiresPermission(Manifest.permission.MODIFY_AUDIO_ROUTING)
    @RequiresPermission(Manifest.permission.MODIFY_AUDIO_ROUTING)
    // TODO also open to MODIFY_AUDIO_SETTINGS_PRIVILEGED b/341780042
    public static List<AudioVolumeGroup> getAudioVolumeGroups() {
    public static List<AudioVolumeGroup> getAudioVolumeGroups() {
        final IAudioService service = getService();
        final IAudioService service = getService();
        try {
        try {
+1 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,7 @@ interface IAudioService {
    @UnsupportedAppUsage
    @UnsupportedAppUsage
    int getStreamMaxVolume(int streamType);
    int getStreamMaxVolume(int streamType);


    @EnforcePermission("MODIFY_AUDIO_ROUTING")
    @EnforcePermission(anyOf={"MODIFY_AUDIO_SETTINGS_PRIVILEGED", "MODIFY_AUDIO_ROUTING"})
    List<AudioVolumeGroup> getAudioVolumeGroups();
    List<AudioVolumeGroup> getAudioVolumeGroups();


    @EnforcePermission(anyOf={"MODIFY_AUDIO_SETTINGS_PRIVILEGED", "MODIFY_AUDIO_ROUTING"})
    @EnforcePermission(anyOf={"MODIFY_AUDIO_SETTINGS_PRIVILEGED", "MODIFY_AUDIO_ROUTING"})
+7 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.internal.util.Preconditions;
import java.util.ArrayList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Arrays;
import java.util.List;
import java.util.List;
import java.util.Objects;


/**
/**
 * A class to create the association between different playback attributes
 * A class to create the association between different playback attributes
@@ -118,6 +119,12 @@ public final class AudioVolumeGroup implements Parcelable {
                && Arrays.equals(mAudioAttributes, thatAvg.mAudioAttributes);
                && Arrays.equals(mAudioAttributes, thatAvg.mAudioAttributes);
    }
    }


    @Override
    public int hashCode() {
        return Objects.hash(mName, mId,
                Arrays.hashCode(mAudioAttributes), Arrays.hashCode(mLegacyStreamTypes));
    }

    /**
    /**
     * @return List of {@link AudioAttributes} involved in this {@link AudioVolumeGroup}.
     * @return List of {@link AudioAttributes} involved in this {@link AudioVolumeGroup}.
     */
     */
Loading