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

am ba43f7e9: Merge "Revert "Sometimes the application context is null""

Browse Source 
* commit 'ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b':
  Revert "Sometimes the application context is null"
This commit is contained in:
Marco Nelissen
2015-04-22 20:28:54 +00:00
committed by Android Git Automerger
parent 9e05ece7ab ba43f7e914
commit 3430f59951
1 changed files with 34 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,6 @@ import java.util.Iterator;
*/
public class AudioManager {
private final Context mOriginalContext;
private final Context mApplicationContext;
private long mVolumeKeyUpTime;
private final boolean mUseMasterVolume;
@@ -642,35 +641,16 @@ public class AudioManager {
* @hide
*/
public AudioManager(Context context) {
setContext(context);
mUseMasterVolume = getContext().getResources().getBoolean(
mApplicationContext = context.getApplicationContext();
mUseMasterVolume = mApplicationContext.getResources().getBoolean(
com.android.internal.R.bool.config_useMasterVolume);
mUseVolumeKeySounds = getContext().getResources().getBoolean(
mUseVolumeKeySounds = mApplicationContext.getResources().getBoolean(
com.android.internal.R.bool.config_useVolumeKeySounds);
mUseFixedVolume = getContext().getResources().getBoolean(
mUseFixedVolume = mApplicationContext.getResources().getBoolean(
com.android.internal.R.bool.config_useFixedVolume);
sAudioPortEventHandler.init();
}
private Context getContext() {
if (mApplicationContext == null) {
setContext(mOriginalContext);
}
if (mApplicationContext != null) {
return mApplicationContext;
}
return mOriginalContext;
}
private void setContext(Context context) {
mApplicationContext = context.getApplicationContext();
if (mApplicationContext != null) {
mOriginalContext = null;
} else {
mOriginalContext = context;
}
}
private static IAudioService getService()
{
if (sService != null) {
@@ -705,7 +685,7 @@ public class AudioManager {
* or {@link KeyEvent#KEYCODE_MEDIA_AUDIO_TRACK}.
*/
public void dispatchMediaKeyEvent(KeyEvent keyEvent) {
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(getContext());
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.sendMediaButtonEvent(keyEvent, false);
}
@@ -766,7 +746,7 @@ public class AudioManager {
break;
case KeyEvent.KEYCODE_VOLUME_MUTE:
if (event.getRepeatCount() == 0) {
MediaSessionLegacyHelper.getHelper(getContext())
MediaSessionLegacyHelper.getHelper(mApplicationContext)
.sendVolumeKeyEvent(event, false);
}
break;
@@ -799,7 +779,7 @@ public class AudioManager {
mVolumeKeyUpTime = SystemClock.uptimeMillis();
break;
case KeyEvent.KEYCODE_VOLUME_MUTE:
MediaSessionLegacyHelper.getHelper(getContext())
MediaSessionLegacyHelper.getHelper(mApplicationContext)
.sendVolumeKeyEvent(event, false);
break;
}
@@ -846,10 +826,10 @@ public class AudioManager {
try {
if (mUseMasterVolume) {
service.adjustMasterVolume(direction, flags,
getContext().getOpPackageName());
mApplicationContext.getOpPackageName());
} else {
service.adjustStreamVolume(streamType, direction, flags,
getContext().getOpPackageName());
mApplicationContext.getOpPackageName());
}
} catch (RemoteException e) {
Log.e(TAG, "Dead object in adjustStreamVolume", e);
@@ -880,10 +860,10 @@ public class AudioManager {
try {
if (mUseMasterVolume) {
service.adjustMasterVolume(direction, flags,
getContext().getOpPackageName());
mApplicationContext.getOpPackageName());
} else {
MediaSessionLegacyHelper helper =
MediaSessionLegacyHelper.getHelper(getContext());
MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.sendAdjustVolumeBy(USE_DEFAULT_STREAM_TYPE, direction, flags);
}
} catch (RemoteException e) {
@@ -916,10 +896,10 @@ public class AudioManager {
try {
if (mUseMasterVolume) {
service.adjustMasterVolume(direction, flags,
getContext().getOpPackageName());
mApplicationContext.getOpPackageName());
} else {
MediaSessionLegacyHelper helper =
MediaSessionLegacyHelper.getHelper(getContext());
MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.sendAdjustVolumeBy(suggestedStreamType, direction, flags);
}
} catch (RemoteException e) {
@@ -939,7 +919,7 @@ public class AudioManager {
public void adjustMasterVolume(int steps, int flags) {
IAudioService service = getService();
try {
service.adjustMasterVolume(steps, flags, getContext().getOpPackageName());
service.adjustMasterVolume(steps, flags, mApplicationContext.getOpPackageName());
} catch (RemoteException e) {
Log.e(TAG, "Dead object in adjustMasterVolume", e);
}
@@ -1080,7 +1060,7 @@ public class AudioManager {
}
IAudioService service = getService();
try {
service.setRingerModeExternal(ringerMode, getContext().getOpPackageName());
service.setRingerModeExternal(ringerMode, mApplicationContext.getOpPackageName());
} catch (RemoteException e) {
Log.e(TAG, "Dead object in setRingerMode", e);
}
@@ -1102,10 +1082,10 @@ public class AudioManager {
IAudioService service = getService();
try {
if (mUseMasterVolume) {
service.setMasterVolume(index, flags, getContext().getOpPackageName());
service.setMasterVolume(index, flags, mApplicationContext.getOpPackageName());
} else {
service.setStreamVolume(streamType, index, flags,
getContext().getOpPackageName());
mApplicationContext.getOpPackageName());
}
} catch (RemoteException e) {
Log.e(TAG, "Dead object in setStreamVolume", e);
@@ -1171,7 +1151,7 @@ public class AudioManager {
public void setMasterVolume(int index, int flags) {
IAudioService service = getService();
try {
service.setMasterVolume(index, flags, getContext().getOpPackageName());
service.setMasterVolume(index, flags, mApplicationContext.getOpPackageName());
} catch (RemoteException e) {
Log.e(TAG, "Dead object in setMasterVolume", e);
}
@@ -1272,7 +1252,7 @@ public class AudioManager {
public void setMasterMute(boolean state, int flags) {
IAudioService service = getService();
try {
service.setMasterMute(state, flags, getContext().getOpPackageName(), mICallBack);
service.setMasterMute(state, flags, mApplicationContext.getOpPackageName(), mICallBack);
} catch (RemoteException e) {
Log.e(TAG, "Dead object in setMasterMute", e);
}
@@ -1510,7 +1490,7 @@ public class AudioManager {
* @see #startBluetoothSco()
*/
public boolean isBluetoothScoAvailableOffCall() {
return getContext().getResources().getBoolean(
return mApplicationContext.getResources().getBoolean(
com.android.internal.R.bool.config_bluetooth_sco_off_call);
}
@@ -1563,7 +1543,7 @@ public class AudioManager {
IAudioService service = getService();
try {
service.startBluetoothSco(mICallBack,
getContext().getApplicationInfo().targetSdkVersion);
mApplicationContext.getApplicationInfo().targetSdkVersion);
} catch (RemoteException e) {
Log.e(TAG, "Dead object in startBluetoothSco", e);
}
@@ -1711,7 +1691,7 @@ public class AudioManager {
public void setMicrophoneMute(boolean on){
IAudioService service = getService();
try {
service.setMicrophoneMute(on, getContext().getOpPackageName());
service.setMicrophoneMute(on, mApplicationContext.getOpPackageName());
} catch (RemoteException e) {
Log.e(TAG, "Dead object in setMicrophoneMute", e);
}
@@ -2142,7 +2122,7 @@ public class AudioManager {
* Settings has an in memory cache, so this is fast.
*/
private boolean querySoundEffectsEnabled(int user) {
return Settings.System.getIntForUser(getContext().getContentResolver(),
return Settings.System.getIntForUser(mApplicationContext.getContentResolver(),
Settings.System.SOUND_EFFECTS_ENABLED, 0, user) != 0;
}
@@ -2554,7 +2534,7 @@ public class AudioManager {
try {
status = service.requestAudioFocus(requestAttributes, durationHint, mICallBack,
mAudioFocusDispatcher, getIdForAudioFocusListener(l),
getContext().getOpPackageName() /* package name */, flags,
mApplicationContext.getOpPackageName() /* package name */, flags,
ap != null ? ap.cb() : null);
} catch (RemoteException e) {
Log.e(TAG, "Can't call requestAudioFocus() on AudioService:", e);
@@ -2579,7 +2559,7 @@ public class AudioManager {
.setInternalLegacyStreamType(streamType).build(),
durationHint, mICallBack, null,
MediaFocusControl.IN_VOICE_COMM_FOCUS_ID,
getContext().getOpPackageName(),
mApplicationContext.getOpPackageName(),
AUDIOFOCUS_FLAG_LOCK,
null /* policy token */);
} catch (RemoteException e) {
@@ -2648,7 +2628,7 @@ public class AudioManager {
if (eventReceiver == null) {
return;
}
if (!eventReceiver.getPackageName().equals(getContext().getPackageName())) {
if (!eventReceiver.getPackageName().equals(mApplicationContext.getPackageName())) {
Log.e(TAG, "registerMediaButtonEventReceiver() error: " +
"receiver and context package names don't match");
return;
@@ -2657,7 +2637,7 @@ public class AudioManager {
Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
// the associated intent will be handled by the component being registered
mediaButtonIntent.setComponent(eventReceiver);
PendingIntent pi = PendingIntent.getBroadcast(getContext(),
PendingIntent pi = PendingIntent.getBroadcast(mApplicationContext,
0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/);
registerMediaButtonIntent(pi, eventReceiver);
}
@@ -2691,8 +2671,8 @@ public class AudioManager {
Log.e(TAG, "Cannot call registerMediaButtonIntent() with a null parameter");
return;
}
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(getContext());
helper.addMediaButtonListener(pi, eventReceiver, getContext());
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.addMediaButtonListener(pi, eventReceiver, mApplicationContext);
}
/**
@@ -2710,7 +2690,7 @@ public class AudioManager {
Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
// the associated intent will be handled by the component being registered
mediaButtonIntent.setComponent(eventReceiver);
PendingIntent pi = PendingIntent.getBroadcast(getContext(),
PendingIntent pi = PendingIntent.getBroadcast(mApplicationContext,
0/*requestCode, ignored*/, mediaButtonIntent, 0/*flags*/);
unregisterMediaButtonIntent(pi);
}
@@ -2733,7 +2713,7 @@ public class AudioManager {
* @hide
*/
public void unregisterMediaButtonIntent(PendingIntent pi) {
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(getContext());
MediaSessionLegacyHelper helper = MediaSessionLegacyHelper.getHelper(mApplicationContext);
helper.removeMediaButtonListener(pi);
}
@@ -2750,7 +2730,7 @@ public class AudioManager {
if ((rcClient == null) || (rcClient.getRcMediaIntent() == null)) {
return;
}
rcClient.registerWithSession(MediaSessionLegacyHelper.getHelper(getContext()));
rcClient.registerWithSession(MediaSessionLegacyHelper.getHelper(mApplicationContext));
}
/**
@@ -2765,7 +2745,7 @@ public class AudioManager {
if ((rcClient == null) || (rcClient.getRcMediaIntent() == null)) {
return;
}
rcClient.unregisterWithSession(MediaSessionLegacyHelper.getHelper(getContext()));
rcClient.unregisterWithSession(MediaSessionLegacyHelper.getHelper(mApplicationContext));
}
/**
@@ -3426,7 +3406,7 @@ public class AudioManager {
*/
public void setRingerModeInternal(int ringerMode) {
try {
getService().setRingerModeInternal(ringerMode, getContext().getOpPackageName());
getService().setRingerModeInternal(ringerMode, mApplicationContext.getOpPackageName());
} catch (RemoteException e) {
Log.w(TAG, "Error calling setRingerModeInternal", e);
}