Merge "MediaProjectionPermissionActivity: Fix NPE."

2015-02-24 17:20:32 +00:00
parent d697ceac02 3d332f4e67
commit 283dbfbd54
1 changed files with 6 additions and 2 deletions
--- 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();
        }
    }