MediaProjectionPermissionActivity: Fix NPE.

Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67)
This commit is contained in:
John Spurlock
2015-02-24 12:14:06 -05:00
parent 246a3a4a79
commit c974ac11f8

View File

@@ -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();
}
}