diff options
| author | John Spurlock <jspurlock@google.com> | 2015-02-24 12:14:06 -0500 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-03-11 19:35:38 -0700 |
| commit | 67676f887181cc329f1f1c828290e686d6ea6d5a (patch) | |
| tree | c77fecbda2e9eb42e627ea2ad6f3a3c73f6330c5 | |
| parent | 78873f4042c4d77bf76efc307a8dc790f9ba285d (diff) | |
| download | base-67676f887181cc329f1f1c828290e686d6ea6d5a.tar.gz | |
MediaProjectionPermissionActivity: Fix NPE.android-5.1.0_r5
Avoid dismissing a null dialog.
Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java index 25bab17bccf3..c23f45dbdaba 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 @@ public class MediaProjectionPermissionActivity extends Activity @Override protected void onDestroy() { super.onDestroy(); - mDialog.dismiss(); + if (mDialog != null) { + mDialog.dismiss(); + } } @Override @@ -128,7 +130,9 @@ public class MediaProjectionPermissionActivity extends Activity Log.e(TAG, "Error granting projection permission", e); setResult(RESULT_CANCELED); } finally { - mDialog.dismiss(); + if (mDialog != null) { + mDialog.dismiss(); + } finish(); } } |