diff options
| author | John Spurlock <jspurlock@google.com> | 2015-02-24 17:20:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-24 17:20:33 +0000 |
| commit | 283dbfbd54125e85c302d54c08a33ffc9de01207 (patch) | |
| tree | 8ea98f4306884408cec93f716ff13814f7a4cc6e /packages | |
| parent | d697ceac0227822ab33d8f7cbe5442cc37d9d74a (diff) | |
| parent | 3d332f4e67a484abe597576bf329d89655afe720 (diff) | |
| download | frameworks_base-283dbfbd54125e85c302d54c08a33ffc9de01207.zip frameworks_base-283dbfbd54125e85c302d54c08a33ffc9de01207.tar.gz frameworks_base-283dbfbd54125e85c302d54c08a33ffc9de01207.tar.bz2 | |
Merge "MediaProjectionPermissionActivity: Fix NPE."
Diffstat (limited to 'packages')
| -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(); } } |