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

Commit 7fd4312a authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "Revert "Replace hidden AudioManager.FLAG_FROM_KEY usage""

parents 516d8447 5a593a18

packages/MediaComponents/apex/java/android/media/MediaUtils.java

+0 −6
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ import android.view.KeyEvent; 
 */

public class MediaUtils {



    /**

     * Adjusting the volume due to a hardware key press.

     * (Copied version of hidden AudioManager.FLAG_FROM_KEY)

     */

    public static final int AUDIO_MANAGER_FLAG_FROM_KEY = 1 << 12;



    // Keep sync with KeyEvent#isMediaKey().

    public static boolean isMediaKey(int keyCode) {

        switch (keyCode) {

packages/MediaComponents/apex/java/android/media/session/MediaController.java

+3 −2
Original line number Diff line number Diff line
@@ -197,8 +197,9 @@ public final class MediaController { 
            }



            case KeyEvent.ACTION_UP: {

                final int flags = AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_VIBRATE

                        | MediaUtils.AUDIO_MANAGER_FLAG_FROM_KEY;

                //TODO(b/119790339): Resolve hidden API usage. AudioManager.FLAG_FROM_KEY

                final int flags = AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_VIBRATE;

                        //| AudioManager.FLAG_FROM_KEY;

                try {

                    mSessionBinder.adjustVolume("mContext.getOpPackageName()", mCbStub, true, 0,

                            flags);