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

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

@@ -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

@@ -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);