Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix context leak"

Browse Source
This commit is contained in:
Marco Nelissen
2015-03-11 18:10:04 +00:00
committed by Gerrit Code Review
parent 686947801e 926ebb860a
commit a3d25d7489
2 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/VideoView.java
View File

@@ -311,6 +311,8 @@ public class VideoView extends SurfaceView
mMediaPlayer = null; mMediaPlayer = null;
mCurrentState = STATE_IDLE; mCurrentState = STATE_IDLE;
mTargetState = STATE_IDLE; mTargetState = STATE_IDLE;
AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
am.abandonAudioFocus(null);
} }
} }
@@ -319,12 +321,13 @@ public class VideoView extends SurfaceView
// not ready for playback just yet, will try again later // not ready for playback just yet, will try again later
return; return;
} }
AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
am.requestAudioFocus(null, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
// we shouldn't clear the target state, because somebody might have // we shouldn't clear the target state, because somebody might have
// called start() previously // called start() previously
release(false); release(false);
AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
am.requestAudioFocus(null, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
try { try {
mMediaPlayer = new MediaPlayer(); mMediaPlayer = new MediaPlayer();
// TODO: create SubtitleController in MediaPlayer, but we need // TODO: create SubtitleController in MediaPlayer, but we need
@@ -650,6 +653,8 @@ public class VideoView extends SurfaceView
if (cleartargetstate) { if (cleartargetstate) {
mTargetState = STATE_IDLE; mTargetState = STATE_IDLE;
} }
AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
am.abandonAudioFocus(null);
} }
} }

79
media/java/android/media/AudioManager.java
View File

@@ -58,7 +58,7 @@ import java.util.Iterator;
*/ */
public class AudioManager { public class AudioManager {
private final Context mContext; private final Context mApplicationContext;
private long mVolumeKeyUpTime; private long mVolumeKeyUpTime;
private final boolean mUseMasterVolume; private final boolean mUseMasterVolume;
private final boolean mUseVolumeKeySounds; private final boolean mUseVolumeKeySounds;
@@ -641,12 +641,12 @@ public class AudioManager {
* @hide * @hide
*/ */
public AudioManager(Context context) { public AudioManager(Context context) {
mContext = context; mApplicationContext = context.getApplicationContext();
mUseMasterVolume = mContext.getResources().getBoolean( mUseMasterVolume = mApplicationContext.getResources().getBoolean(
com.android.internal.R.bool.config_useMasterVolume); com.android.internal.R.bool.config_useMasterVolume);
mUseVolumeKeySounds = mContext.getResources().getBoolean( mUseVolumeKeySounds = mApplicationContext.getResources().getBoolean(
com.android.internal.R.bool.config_useVolumeKeySounds); com.android.internal.R.bool.config_useVolumeKeySounds);
mUseFixedVolume = mContext.getResources().getBoolean( mUseFixedVolume = mApplicationContext.getResources().getBoolean(
com.android.internal.R.bool.config_useFixedVolume); com.android.internal.R.bool.config_useFixedVolume);
sAudioPortEventHandler.init(); sAudioPortEventHandler.init();
} }
@@ -685,7 +685,7 @@ public class AudioManager {
* or {@link KeyEvent#KEYCODE_MEDIA_AUDIO_TRACK}. * or {@link KeyEvent#KEYCODE_MEDIA_AUDIO_TRACK}.
*/ */
public void dispatchMediaKeyEvent(KeyEvent keyEvent) { public void dispatchMediaKeyEvent(KeyEvent keyEvent) {
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mContext); MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.sendMediaButtonEvent(keyEvent, false); helper.sendMediaButtonEvent(keyEvent, false);
} }
@@ -746,7 +746,8 @@ public class AudioManager {
break; break;
case KeyEvent.KEYCODE_VOLUME_MUTE: case KeyEvent.KEYCODE_VOLUME_MUTE:
if (event.getRepeatCount() == 0) { if (event.getRepeatCount() == 0) {
MediaSessionLegacyHelper.getHelper(mContext).sendVolumeKeyEvent(event, false); MediaSessionLegacyHelper.getHelper(mApplicationContext)
.sendVolumeKeyEvent(event, false);
} }
break; break;
} }
@@ -778,7 +779,8 @@ public class AudioManager {
mVolumeKeyUpTime = SystemClock.uptimeMillis(); mVolumeKeyUpTime = SystemClock.uptimeMillis();
break; break;
case KeyEvent.KEYCODE_VOLUME_MUTE: case KeyEvent.KEYCODE_VOLUME_MUTE:
MediaSessionLegacyHelper.getHelper(mContext).sendVolumeKeyEvent(event, false); MediaSessionLegacyHelper.getHelper(mApplicationContext)
.sendVolumeKeyEvent(event, false);
break; break;
} }
} }
@@ -823,10 +825,11 @@ public class AudioManager {
IAudioService service = getService(); IAudioService service = getService();
try { try {
if (mUseMasterVolume) { if (mUseMasterVolume) {
service.adjustMasterVolume(direction, flags, mContext.getOpPackageName()); service.adjustMasterVolume(direction, flags,
mApplicationContext.getOpPackageName());
} else { } else {
service.adjustStreamVolume(streamType, direction, flags, service.adjustStreamVolume(streamType, direction, flags,
mContext.getOpPackageName()); mApplicationContext.getOpPackageName());
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Dead object in adjustStreamVolume", e); Log.e(TAG, "Dead object in adjustStreamVolume", e);
@@ -856,9 +859,11 @@ public class AudioManager {
IAudioService service = getService(); IAudioService service = getService();
try { try {
if (mUseMasterVolume) { if (mUseMasterVolume) {
service.adjustMasterVolume(direction, flags, mContext.getOpPackageName()); service.adjustMasterVolume(direction, flags,
mApplicationContext.getOpPackageName());
} else { } else {
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mContext); MediaSessionLegacyHelper helper =
MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.sendAdjustVolumeBy(USE_DEFAULT_STREAM_TYPE, direction, flags); helper.sendAdjustVolumeBy(USE_DEFAULT_STREAM_TYPE, direction, flags);
} }
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -890,9 +895,11 @@ public class AudioManager {
IAudioService service = getService(); IAudioService service = getService();
try { try {
if (mUseMasterVolume) { if (mUseMasterVolume) {
service.adjustMasterVolume(direction, flags, mContext.getOpPackageName()); service.adjustMasterVolume(direction, flags,
mApplicationContext.getOpPackageName());
} else { } else {
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mContext); MediaSessionLegacyHelper helper =
MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.sendAdjustVolumeBy(suggestedStreamType, direction, flags); helper.sendAdjustVolumeBy(suggestedStreamType, direction, flags);
} }
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -912,7 +919,7 @@ public class AudioManager {
public void adjustMasterVolume(int steps, int flags) { public void adjustMasterVolume(int steps, int flags) {
IAudioService service = getService(); IAudioService service = getService();
try { try {
service.adjustMasterVolume(steps, flags, mContext.getOpPackageName()); service.adjustMasterVolume(steps, flags, mApplicationContext.getOpPackageName());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Dead object in adjustMasterVolume", e); Log.e(TAG, "Dead object in adjustMasterVolume", e);
} }
@@ -1053,7 +1060,7 @@ public class AudioManager {
} }
IAudioService service = getService(); IAudioService service = getService();
try { try {
service.setRingerModeExternal(ringerMode, mContext.getOpPackageName()); service.setRingerModeExternal(ringerMode, mApplicationContext.getOpPackageName());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Dead object in setRingerMode", e); Log.e(TAG, "Dead object in setRingerMode", e);
} }
@@ -1075,9 +1082,10 @@ public class AudioManager {
IAudioService service = getService(); IAudioService service = getService();
try { try {
if (mUseMasterVolume) { if (mUseMasterVolume) {
service.setMasterVolume(index, flags, mContext.getOpPackageName()); service.setMasterVolume(index, flags, mApplicationContext.getOpPackageName());
} else { } else {
service.setStreamVolume(streamType, index, flags, mContext.getOpPackageName()); service.setStreamVolume(streamType, index, flags,
mApplicationContext.getOpPackageName());
} }
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Dead object in setStreamVolume", e); Log.e(TAG, "Dead object in setStreamVolume", e);
@@ -1143,7 +1151,7 @@ public class AudioManager {
public void setMasterVolume(int index, int flags) { public void setMasterVolume(int index, int flags) {
IAudioService service = getService(); IAudioService service = getService();
try { try {
service.setMasterVolume(index, flags, mContext.getOpPackageName()); service.setMasterVolume(index, flags, mApplicationContext.getOpPackageName());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Dead object in setMasterVolume", e); Log.e(TAG, "Dead object in setMasterVolume", e);
} }
@@ -1244,7 +1252,7 @@ public class AudioManager {
public void setMasterMute(boolean state, int flags) { public void setMasterMute(boolean state, int flags) {
IAudioService service = getService(); IAudioService service = getService();
try { try {
service.setMasterMute(state, flags, mContext.getOpPackageName(), mICallBack); service.setMasterMute(state, flags, mApplicationContext.getOpPackageName(), mICallBack);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Dead object in setMasterMute", e); Log.e(TAG, "Dead object in setMasterMute", e);
} }
@@ -1482,7 +1490,7 @@ public class AudioManager {
* @see #startBluetoothSco() * @see #startBluetoothSco()
*/ */
public boolean isBluetoothScoAvailableOffCall() { public boolean isBluetoothScoAvailableOffCall() {
return mContext.getResources().getBoolean( return mApplicationContext.getResources().getBoolean(
com.android.internal.R.bool.config_bluetooth_sco_off_call); com.android.internal.R.bool.config_bluetooth_sco_off_call);
} }
@@ -1534,7 +1542,8 @@ public class AudioManager {
public void startBluetoothSco(){ public void startBluetoothSco(){
IAudioService service = getService(); IAudioService service = getService();
try { try {
service.startBluetoothSco(mICallBack, mContext.getApplicationInfo().targetSdkVersion); service.startBluetoothSco(mICallBack,
mApplicationContext.getApplicationInfo().targetSdkVersion);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Dead object in startBluetoothSco", e); Log.e(TAG, "Dead object in startBluetoothSco", e);
} }
@@ -1682,7 +1691,7 @@ public class AudioManager {
public void setMicrophoneMute(boolean on){ public void setMicrophoneMute(boolean on){
IAudioService service = getService(); IAudioService service = getService();
try { try {
service.setMicrophoneMute(on, mContext.getOpPackageName()); service.setMicrophoneMute(on, mApplicationContext.getOpPackageName());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Dead object in setMicrophoneMute", e); Log.e(TAG, "Dead object in setMicrophoneMute", e);
} }
@@ -2113,7 +2122,7 @@ public class AudioManager {
* Settings has an in memory cache, so this is fast. * Settings has an in memory cache, so this is fast.
*/ */
private boolean querySoundEffectsEnabled(int user) { private boolean querySoundEffectsEnabled(int user) {
return Settings.System.getIntForUser(mContext.getContentResolver(), return Settings.System.getIntForUser(mApplicationContext.getContentResolver(),
Settings.System.SOUND_EFFECTS_ENABLED, 0, user) != 0; Settings.System.SOUND_EFFECTS_ENABLED, 0, user) != 0;
} }
@@ -2525,7 +2534,7 @@ public class AudioManager {
try { try {
status = service.requestAudioFocus(requestAttributes, durationHint, mICallBack, status = service.requestAudioFocus(requestAttributes, durationHint, mICallBack,
mAudioFocusDispatcher, getIdForAudioFocusListener(l), mAudioFocusDispatcher, getIdForAudioFocusListener(l),
mContext.getOpPackageName() /* package name */, flags, mApplicationContext.getOpPackageName() /* package name */, flags,
ap != null ? ap.cb() : null); ap != null ? ap.cb() : null);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Can't call requestAudioFocus() on AudioService:", e); Log.e(TAG, "Can't call requestAudioFocus() on AudioService:", e);
@@ -2550,7 +2559,7 @@ public class AudioManager {
.setInternalLegacyStreamType(streamType).build(), .setInternalLegacyStreamType(streamType).build(),
durationHint, mICallBack, null, durationHint, mICallBack, null,
MediaFocusControl.IN_VOICE_COMM_FOCUS_ID, MediaFocusControl.IN_VOICE_COMM_FOCUS_ID,
mContext.getOpPackageName(), mApplicationContext.getOpPackageName(),
AUDIOFOCUS_FLAG_LOCK, AUDIOFOCUS_FLAG_LOCK,
null /* policy token */); null /* policy token */);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -2619,7 +2628,7 @@ public class AudioManager {
if (eventReceiver == null) { if (eventReceiver == null) {
return; return;
} }
if (!eventReceiver.getPackageName().equals(mContext.getPackageName())) { if (!eventReceiver.getPackageName().equals(mApplicationContext.getPackageName())) {
Log.e(TAG, "registerMediaButtonEventReceiver() error: " + Log.e(TAG, "registerMediaButtonEventReceiver() error: " +
"receiver and context package names don't match"); "receiver and context package names don't match");
return; return;
@@ -2628,7 +2637,7 @@ public class AudioManager {
Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON); Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
// the associated intent will be handled by the component being registered // the associated intent will be handled by the component being registered
mediaButtonIntent.setComponent(eventReceiver); mediaButtonIntent.setComponent(eventReceiver);
PendingIntent pi = PendingIntent.getBroadcast(mContext, PendingIntent pi = PendingIntent.getBroadcast(mApplicationContext,
0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/); 0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/);
registerMediaButtonIntent(pi, eventReceiver); registerMediaButtonIntent(pi, eventReceiver);
} }
@@ -2662,8 +2671,8 @@ public class AudioManager {
Log.e(TAG, "Cannot call registerMediaButtonIntent() with a null parameter"); Log.e(TAG, "Cannot call registerMediaButtonIntent() with a null parameter");
return; return;
} }
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mContext); MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.addMediaButtonListener(pi, eventReceiver, mContext); helper.addMediaButtonListener(pi, eventReceiver, mApplicationContext);
} }
/** /**
@@ -2681,7 +2690,7 @@ public class AudioManager {
Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON); Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
// the associated intent will be handled by the component being registered // the associated intent will be handled by the component being registered
mediaButtonIntent.setComponent(eventReceiver); mediaButtonIntent.setComponent(eventReceiver);
PendingIntent pi = PendingIntent.getBroadcast(mContext, PendingIntent pi = PendingIntent.getBroadcast(mApplicationContext,
0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/); 0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/);
unregisterMediaButtonIntent(pi); unregisterMediaButtonIntent(pi);
} }
@@ -2704,7 +2713,7 @@ public class AudioManager {
* @hide * @hide
*/ */
public void unregisterMediaButtonIntent(PendingIntent pi) { public void unregisterMediaButtonIntent(PendingIntent pi) {
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mContext); MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.removeMediaButtonListener(pi); helper.removeMediaButtonListener(pi);
} }
@@ -2721,7 +2730,7 @@ public class AudioManager {
if ((rcClient == null) || (rcClient.getRcMediaIntent() == null)) { if ((rcClient == null) || (rcClient.getRcMediaIntent() == null)) {
return; return;
} }
rcClient.registerWithSession(MediaSessionLegacyHelper.getHelper(mContext)); rcClient.registerWithSession(MediaSessionLegacyHelper.getHelper(mApplicationContext));
} }
/** /**
@@ -2736,7 +2745,7 @@ public class AudioManager {
if ((rcClient == null) || (rcClient.getRcMediaIntent() == null)) { if ((rcClient == null) || (rcClient.getRcMediaIntent() == null)) {
return; return;
} }
rcClient.unregisterWithSession(MediaSessionLegacyHelper.getHelper(mContext)); rcClient.unregisterWithSession(MediaSessionLegacyHelper.getHelper(mApplicationContext));
} }
/** /**
@@ -3397,7 +3406,7 @@ public class AudioManager {
*/ */
public void setRingerModeInternal(int ringerMode) { public void setRingerModeInternal(int ringerMode) {
try { try {
getService().setRingerModeInternal(ringerMode, mContext.getOpPackageName()); getService().setRingerModeInternal(ringerMode, mApplicationContext.getOpPackageName());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "Error calling setRingerModeInternal", e); Log.w(TAG, "Error calling setRingerModeInternal", e);
} }