diff options
| author | John Spurlock <jspurlock@google.com> | 2015-02-24 12:14:06 -0500 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2015-02-24 12:14:06 -0500 |
| commit | 3d332f4e67a484abe597576bf329d89655afe720 (patch) | |
| tree | 5ddb99fb31777f8135e6b1cf53d5f0f31af9dd1b | |
| parent | 419389c52a2c81cbb0b4615d6b0b1c1253c3469c (diff) | |
| download | frameworks_base-3d332f4e67a484abe597576bf329d89655afe720.zip frameworks_base-3d332f4e67a484abe597576bf329d89655afe720.tar.gz frameworks_base-3d332f4e67a484abe597576bf329d89655afe720.tar.bz2 | |
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
| -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 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 @@ 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(); } } |