Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

Browse Source 
* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
  MediaProjectionPermissionActivity: Fix NPE.
This commit is contained in:
John Spurlock
2015-03-04 23:15:51 +00:00
committed by Android Git Automerger
parent 850fd489de bd43874287
commit 3bedeb0101
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java
View File

@@ -114,7 +114,9 @@ public class MediaProjectionPermissionActivity extends Activity
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
mDialog.dismiss(); if (mDialog != null) {
mDialog.dismiss();
}
} }
@Override @Override
@@ -128,7 +130,9 @@ public class MediaProjectionPermissionActivity extends Activity
Log.e(TAG, "Error granting projection permission", e); Log.e(TAG, "Error granting projection permission", e);
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);
} finally { } finally {
mDialog.dismiss(); if (mDialog != null) {
mDialog.dismiss();
}
finish(); finish();
} }
} }