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

Commit ca532f20 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AudioSystem master balance permission annotation"

parents 645e56e8 0377204e

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -979,9 +979,9 @@ package android.media { 
  }



  public class AudioSystem {

    method public static float getMasterBalance();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS) public static float getMasterBalance();

    method public static final int getNumStreamTypes();

    method public static int setMasterBalance(float);

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS) public static int setMasterBalance(float);

    field public static final int DEVICE_ROLE_DISABLED = 2; // 0x2

    field public static final int DEVICE_ROLE_NONE = 0; // 0x0

    field public static final int DEVICE_ROLE_PREFERRED = 1; // 0x1

media/java/android/media/AudioSystem.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.media; 


import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.TestApi;

import android.bluetooth.BluetoothCodecConfig;

import android.compat.annotation.UnsupportedAppUsage;
@@ -1550,9 +1551,11 @@ public class AudioSystem 


    /** @hide returns master balance value in range -1.f -> 1.f, where 0.f is dead center. */

    @TestApi

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS)

    public static native float getMasterBalance();

    /** @hide Changes the audio balance of the device. */

    @TestApi

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS)

    public static native int setMasterBalance(float balance);



    // helpers for android.media.AudioManager.getProperty(), see description there for meaning