resolved conflicts for merge of 42f55d1e to master

Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec

diff --cc core/java/android/widget/VideoView.java
Simple merge

diff --cc media/java/android/media/AudioManager.java
index db67fbf,ed6ce87..85aaf4c
--- 1/media/java/android/media/AudioManager.java
--- 2/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@@ -56,10 -58,12 +56,10 @@@ import java.util.Iterator
   */
  public class AudioManager {
  
-     private final Context mContext;
+     private final Context mApplicationContext;
      private long mVolumeKeyUpTime;
 -    private final boolean mUseMasterVolume;
      private final boolean mUseVolumeKeySounds;
      private final boolean mUseFixedVolume;
 -    private final Binder mToken = new Binder();
      private static String TAG = "AudioManager";
      private static final AudioPortEventHandler sAudioPortEventHandler = new AudioPortEventHandler();
  
@@@ -575,10 -641,12 +575,10 @@@
       * @hide
       */
      public AudioManager(Context context) {
-         mContext = context;
-         mUseVolumeKeySounds = mContext.getResources().getBoolean(
 -        mApplicationContext = context.getApplicationContext();
 -        mUseMasterVolume = mApplicationContext.getResources().getBoolean(
 -                com.android.internal.R.bool.config_useMasterVolume);
++        mApplicationContext = context;
+         mUseVolumeKeySounds = mApplicationContext.getResources().getBoolean(
                  com.android.internal.R.bool.config_useVolumeKeySounds);
-         mUseFixedVolume = mContext.getResources().getBoolean(
+         mUseFixedVolume = mApplicationContext.getResources().getBoolean(
                  com.android.internal.R.bool.config_useFixedVolume);
          sAudioPortEventHandler.init();
      }
@@@ -734,8 -824,13 +736,8 @@@
      public void adjustStreamVolume(int streamType, int direction, int flags) {
          IAudioService service = getService();
          try {
 -            if (mUseMasterVolume) {
 -                service.adjustMasterVolume(direction, flags,
 -                        mApplicationContext.getOpPackageName());
 -            } else {
 -                service.adjustStreamVolume(streamType, direction, flags,
 -                        mApplicationContext.getOpPackageName());
 -            }
 +            service.adjustStreamVolume(streamType, direction, flags,
-                     mContext.getOpPackageName());
++                    mApplicationContext.getOpPackageName());
          } catch (RemoteException e) {
              Log.e(TAG, "Dead object in adjustStreamVolume", e);
          }
@@@ -765,8 -856,19 +767,8 @@@
       * @see #isVolumeFixed()
       */
      public void adjustVolume(int direction, int flags) {
-         MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mContext);
 -        IAudioService service = getService();
 -        try {
 -            if (mUseMasterVolume) {
 -                service.adjustMasterVolume(direction, flags,
 -                        mApplicationContext.getOpPackageName());
 -            } else {
 -                MediaSessionLegacyHelper helper =
 -                        MediaSessionLegacyHelper.getHelper(mApplicationContext);
 -                helper.sendAdjustVolumeBy(USE_DEFAULT_STREAM_TYPE, direction, flags);
 -            }
 -        } catch (RemoteException e) {
 -            Log.e(TAG, "Dead object in adjustVolume", e);
 -        }
++        MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mApplicationContext);
 +        helper.sendAdjustVolumeBy(USE_DEFAULT_STREAM_TYPE, direction, flags);
      }
  
      /**
@@@ -794,17 -892,36 +796,17 @@@
       * @see #isVolumeFixed()
       */
      public void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags) {
-         MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mContext);
 -        IAudioService service = getService();
 -        try {
 -            if (mUseMasterVolume) {
 -                service.adjustMasterVolume(direction, flags,
 -                        mApplicationContext.getOpPackageName());
 -            } else {
 -                MediaSessionLegacyHelper helper =
 -                        MediaSessionLegacyHelper.getHelper(mApplicationContext);
 -                helper.sendAdjustVolumeBy(suggestedStreamType, direction, flags);
 -            }
 -        } catch (RemoteException e) {
 -            Log.e(TAG, "Dead object in adjustSuggestedStreamVolume", e);
 -        }
++        MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mApplicationContext);
 +        helper.sendAdjustVolumeBy(suggestedStreamType, direction, flags);
      }
  
 -    /**
 -     * Adjusts the master volume for the device's audio amplifier.
 -     * <p>
 -     *
 -     * @param steps The number of volume steps to adjust. A positive
 -     *            value will raise the volume.
 -     * @param flags One or more flags.
 -     * @hide
 -     */
 -    public void adjustMasterVolume(int steps, int flags) {
 +    /** @hide */
 +    public void setMasterMute(boolean mute, int flags) {
          IAudioService service = getService();
          try {
-             service.setMasterMute(mute, flags, mContext.getOpPackageName());
 -            service.adjustMasterVolume(steps, flags, mApplicationContext.getOpPackageName());
++            service.setMasterMute(mute, flags, mApplicationContext.getOpPackageName());
          } catch (RemoteException e) {
 -            Log.e(TAG, "Dead object in adjustMasterVolume", e);
 +            Log.e(TAG, "Dead object in setMasterMute", e);
          }
      }
  
@@@ -952,7 -1081,12 +954,7 @@@
      public void setStreamVolume(int streamType, int index, int flags) {
          IAudioService service = getService();
          try {
-             service.setStreamVolume(streamType, index, flags, mContext.getOpPackageName());
 -            if (mUseMasterVolume) {
 -                service.setMasterVolume(index, flags, mApplicationContext.getOpPackageName());
 -            } else {
 -                service.setStreamVolume(streamType, index, flags,
 -                        mApplicationContext.getOpPackageName());
 -            }
++            service.setStreamVolume(streamType, index, flags, mApplicationContext.getOpPackageName());
          } catch (RemoteException e) {
              Log.e(TAG, "Dead object in setStreamVolume", e);
          }
@@@ -1498,7 -1724,7 +1501,7 @@@
      public void setMode(int mode) {
          IAudioService service = getService();
          try {
-             service.setMode(mode, mICallBack, mContext.getOpPackageName());
 -            service.setMode(mode, mICallBack);
++            service.setMode(mode, mICallBack, mApplicationContext.getOpPackageName());
          } catch (RemoteException e) {
              Log.e(TAG, "Dead object in setMode", e);
          }
@@@ -2332,8 -2558,8 +2335,8 @@@
              service.requestAudioFocus(new AudioAttributes.Builder()
                          .setInternalLegacyStreamType(streamType).build(),
                      durationHint, mICallBack, null,
 -                    MediaFocusControl.IN_VOICE_COMM_FOCUS_ID,
 +                    AudioSystem.IN_VOICE_COMM_FOCUS_ID,
-                     mContext.getOpPackageName(),
+                     mApplicationContext.getOpPackageName(),
                      AUDIOFOCUS_FLAG_LOCK,
                      null /* policy token */);
          } catch (RemoteException e) {
@@@ -3034,11 -3260,10 +3037,11 @@@
       * @param name   device name
       * {@hide}
       */
 -    public void setWiredDeviceConnectionState(int device, int state, String name) {
 +    public void setWiredDeviceConnectionState(int type, int state, String address, String name) {
          IAudioService service = getService();
          try {
 -            service.setWiredDeviceConnectionState(device, state, name);
 +            service.setWiredDeviceConnectionState(type, state, address, name,
-                     mContext.getOpPackageName());
++                    mApplicationContext.getOpPackageName());
          } catch (RemoteException e) {
              Log.e(TAG, "Dead object in setWiredDeviceConnectionState "+e);
          }
@@@ -3167,22 -3392,9 +3170,22 @@@
       * Only useful for volume controllers.
       * @hide
       */
 +    public boolean isStreamAffectedByMute(int streamType) {
 +        try {
 +            return getService().isStreamAffectedByMute(streamType);
 +        } catch (RemoteException e) {
 +            Log.w(TAG, "Error calling isStreamAffectedByMute", e);
 +            return false;
 +        }
 +    }
 +
 +    /**
 +     * Only useful for volume controllers.
 +     * @hide
 +     */
      public void disableSafeMediaVolume() {
          try {
-             getService().disableSafeMediaVolume(mContext.getOpPackageName());
 -            getService().disableSafeMediaVolume();
++            getService().disableSafeMediaVolume(mApplicationContext.getOpPackageName());
          } catch (RemoteException e) {
              Log.w(TAG, "Error disabling safe media volume", e);
          }