diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-24 02:26:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-24 02:26:28 +0000 |
commit | a242c6eb27d0561ba18b63b2109b70b9d7dee4fc (patch) | |
tree | 9dc3328d5b6a4c70c4691e01e9eed0142f08c63f /src | |
parent | 65a2054a9b996a806588d4a03903c4ad34760023 (diff) | |
parent | bbdd505c6bab6c5817fbd1c29dac5df90ac5732f (diff) |
am bbdd505c: am f3d021bf: am 8a8f68fc: Merge "Protect against null context." into mnc-dev
* commit 'bbdd505c6bab6c5817fbd1c29dac5df90ac5732f':
Protect against null context.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java index 5e75ca7e2..4cd8c4d13 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java @@ -272,8 +272,8 @@ public class VoicemailPlaybackPresenter * Must be invoked when the parent activity is paused. */ public void onPause() { - int orientation = mContext.getResources().getConfiguration().orientation; - if (mInitialOrientation != orientation && mIsPrepared) { + if (mContext != null && mIsPrepared + && mInitialOrientation != mContext.getResources().getConfiguration().orientation) { // If an orientation change triggers the pause, retain the MediaPlayer. Log.d(TAG, "onPause: Orientation changed."); return; |