Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c974ac11 authored by John Spurlock's avatar John Spurlock
Browse files

MediaProjectionPermissionActivity: Fix NPE. 

Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e)
parent 246a3a4a

packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

+6 −2
Original line number Diff line number Diff line
@@ -114,8 +114,10 @@ public class MediaProjectionPermissionActivity extends Activity 
    @Override

    protected void onDestroy() {

        super.onDestroy();

        if (mDialog != null) {

            mDialog.dismiss();

        }

    }



    @Override

    public void onClick(DialogInterface dialog, int which) {
@@ -128,7 +130,9 @@ public class MediaProjectionPermissionActivity extends Activity 
            Log.e(TAG, "Error granting projection permission", e);

            setResult(RESULT_CANCELED);

        } finally {

            if (mDialog != null) {

                mDialog.dismiss();

            }

            finish();

        }

    }