commit f3d021bfd6a1f930feede7153ad9a8b7dec8c7fd
author Andrew Lee <anwlee@google.com> Wed Jun 24 02:04:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 02:04:50 2015 +0000
tree 78b32d19468b6be3a1e922e206d5e8ed4ab04c3e
parent d11524c726aaed4f30f3084a14bfafc627a355a9
parent 8a8f68fc75c7b92fd32e8e6ff0a43ee024e3ac69

am 8a8f68fc: Merge "Protect against null context." into mnc-dev

* commit '8a8f68fc75c7b92fd32e8e6ff0a43ee024e3ac69':
  Protect against null context.

src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java

diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
index 5e75ca7..4cd8c4d 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -272,8 +272,8 @@
      * 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;