From 58b97fe09205eea731f5a51d7be0a83230550ab8 Mon Sep 17 00:00:00 2001 From: kaiyiz Date: Wed, 2 Apr 2014 14:08:31 +0800 Subject: DownloadProvider: fix the crash when rotate screen. TrampolineActivity will be recreated when rotate screen, then the fragment is currently associated with any Activity. So getActivity() will return a null and caused NullPointerException. Add the null check before call finish(). CRs-Fixed: 640914 Change-Id: I76f368a597552e824d533b6a66ea23fad4c0cb41 --- ui/src/com/android/providers/downloads/ui/TrampolineActivity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java b/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java index f9983fc7..8ada01b0 100755 --- a/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java +++ b/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java @@ -165,7 +165,9 @@ public class TrampolineActivity extends Activity { @Override public void onDismiss(DialogInterface dialog) { super.onDismiss(dialog); - getActivity().finish(); + if (getActivity() != null) { + getActivity().finish(); + } } } @@ -234,7 +236,9 @@ public class TrampolineActivity extends Activity { @Override public void onDismiss(DialogInterface dialog) { super.onDismiss(dialog); - getActivity().finish(); + if (getActivity() != null) { + getActivity().finish(); + } } } } -- cgit v1.2.3