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

Commit 3dd7734d authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Android (Google) Code Review
Browse files

Merge "Revert "AudioAttributes: add SPEAKER_CLEANUP to system usages"" into main

parents 29e461a6 5f37d1fd
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -7230,7 +7230,6 @@ package android.media {
    field @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.MODIFY_AUDIO_ROUTING}) public static final int USAGE_CALL_ASSISTANT = 17; // 0x11
    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int USAGE_EMERGENCY = 1000; // 0x3e8
    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int USAGE_SAFETY = 1001; // 0x3e9
    field @FlaggedApi("android.media.audio.speaker_cleanup_usage") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int USAGE_SPEAKER_CLEANUP = 1004; // 0x3ec
    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int USAGE_VEHICLE_STATUS = 1002; // 0x3ea
  }
+8 −24
Original line number Diff line number Diff line
@@ -16,15 +16,11 @@

package android.media;

import static android.media.audio.Flags.FLAG_SPEAKER_CLEANUP_USAGE;

import android.annotation.FlaggedApi;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.TestApi;
// TODO switch from HIDL imports to AIDL
import android.audio.policy.configuration.V7_0.AudioUsage;
import android.compat.annotation.UnsupportedAppUsage;
import android.media.audiopolicy.AudioProductStrategy;
@@ -250,16 +246,6 @@ public final class AudioAttributes implements Parcelable {
    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
    public static final int USAGE_ANNOUNCEMENT = SYSTEM_USAGE_OFFSET + 3;

    /**
     * @hide
     * Usage value to use when a system application plays a signal intended to clean up the
     * speaker transducers and free them of deposits of dust or water.
     */
    @FlaggedApi(FLAG_SPEAKER_CLEANUP_USAGE)
    @SystemApi
    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
    public static final int USAGE_SPEAKER_CLEANUP = SYSTEM_USAGE_OFFSET + 4;

    /**
     * IMPORTANT: when adding new usage types, add them to SDK_USAGES and update SUPPRESSIBLE_USAGES
     *            if applicable, as well as audioattributes.proto.
@@ -1536,8 +1522,6 @@ public final class AudioAttributes implements Parcelable {
                return "USAGE_VEHICLE_STATUS";
            case USAGE_ANNOUNCEMENT:
                return "USAGE_ANNOUNCEMENT";
            case USAGE_SPEAKER_CLEANUP:
                return "USAGE_SPEAKER_CLEANUP";
            default:
                return "unknown usage " + usage;
        }
@@ -1678,8 +1662,12 @@ public final class AudioAttributes implements Parcelable {
    }

    /**
     * Returns whether the given usage can only be used by system-privileged components
     * @param usage one of {@link AttributeSystemUsage}.
     * @param usage one of {@link AttributeSystemUsage},
     *     {@link AttributeSystemUsage#USAGE_CALL_ASSISTANT},
     *     {@link AttributeSystemUsage#USAGE_EMERGENCY},
     *     {@link AttributeSystemUsage#USAGE_SAFETY},
     *     {@link AttributeSystemUsage#USAGE_VEHICLE_STATUS},
     *     {@link AttributeSystemUsage#USAGE_ANNOUNCEMENT}
     * @return boolean indicating if the usage is a system usage or not
     * @hide
     */
@@ -1689,8 +1677,7 @@ public final class AudioAttributes implements Parcelable {
                || usage == USAGE_EMERGENCY
                || usage == USAGE_SAFETY
                || usage == USAGE_VEHICLE_STATUS
                || usage == USAGE_ANNOUNCEMENT
                || usage == USAGE_SPEAKER_CLEANUP);
                || usage == USAGE_ANNOUNCEMENT);
    }

    /**
@@ -1805,7 +1792,6 @@ public final class AudioAttributes implements Parcelable {
            case USAGE_SAFETY:
            case USAGE_VEHICLE_STATUS:
            case USAGE_ANNOUNCEMENT:
            case USAGE_SPEAKER_CLEANUP:
            case USAGE_UNKNOWN:
                return AudioSystem.STREAM_MUSIC;
            default:
@@ -1845,8 +1831,7 @@ public final class AudioAttributes implements Parcelable {
            USAGE_EMERGENCY,
            USAGE_SAFETY,
            USAGE_VEHICLE_STATUS,
            USAGE_ANNOUNCEMENT,
            USAGE_SPEAKER_CLEANUP
            USAGE_ANNOUNCEMENT
    })
    @Retention(RetentionPolicy.SOURCE)
    public @interface AttributeSystemUsage {}
@@ -1896,7 +1881,6 @@ public final class AudioAttributes implements Parcelable {
        USAGE_SAFETY,
        USAGE_VEHICLE_STATUS,
        USAGE_ANNOUNCEMENT,
        USAGE_SPEAKER_CLEANUP,
    })
    @Retention(RetentionPolicy.SOURCE)
    public @interface AttributeUsage {}
+0 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,6 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
        switch (attr.getUsage()) {
            case AudioAttributes.USAGE_MEDIA:
            case AudioAttributes.USAGE_GAME:
            case AudioAttributes.USAGE_SPEAKER_CLEANUP:
                return 1000;
            case AudioAttributes.USAGE_ALARM:
            case AudioAttributes.USAGE_NOTIFICATION_RINGTONE: