commit 4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819
author Bart Sears <bsears@google.com> Thu Mar 05 00:35:07 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 05 00:35:08 2015 +0000
tree 0c5602b8dbc76e70f02f15bc267578a2cf8ae65d
parent c974ac11f808968648d26e83a0b64a7fba02ad15
parent bbd2ac5adf889e9562f0882fb35cadfcbfead740

Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev

packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java
index 25bab17..c23f45d 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java
@@ -114,7 +114,9 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mDialog.dismiss();
+        if (mDialog != null) {
+            mDialog.dismiss();
+        }
     }
 
     @Override
@@ -128,7 +130,9 @@
             Log.e(TAG, "Error granting projection permission", e);
             setResult(RESULT_CANCELED);
         } finally {
-            mDialog.dismiss();
+            if (mDialog != null) {
+                mDialog.dismiss();
+            }
             finish();
         }
     }