diff options
| author | John Spurlock <jspurlock@google.com> | 2015-03-04 23:15:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-04 23:15:51 +0000 |
| commit | 3bedeb010103f4da26241c23929aa38598758f93 (patch) | |
| tree | 77fd98ec62a0cf3e501cfd54ed616ec63ae4d7cb /packages | |
| parent | 850fd489dea0cdf7199cce73027fc95658b0993f (diff) | |
| parent | bd438742870a51eacea3554376f671bd1be0e30c (diff) | |
| download | frameworks_base-3bedeb010103f4da26241c23929aa38598758f93.zip frameworks_base-3bedeb010103f4da26241c23929aa38598758f93.tar.gz frameworks_base-3bedeb010103f4da26241c23929aa38598758f93.tar.bz2 | |
am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
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(); } } |