summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-04-02 14:08:31 +0800
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-24 03:25:47 +0200
commitb37c8b79760ab1d82fd662f7de30de9ec3c09460 (patch)
tree2a58c343f6aa9b8cc31f7bad70c51af66bf2b1c9 /ui
parentaeda32ab01c78437845a1bc41ee9e6941594d49d (diff)
downloadandroid_packages_providers_DownloadProvider-b37c8b79760ab1d82fd662f7de30de9ec3c09460.tar.gz
android_packages_providers_DownloadProvider-b37c8b79760ab1d82fd662f7de30de9ec3c09460.tar.bz2
android_packages_providers_DownloadProvider-b37c8b79760ab1d82fd662f7de30de9ec3c09460.zip
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
Diffstat (limited to 'ui')
-rw-r--r--ui/src/com/android/providers/downloads/ui/TrampolineActivity.java8
1 files 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 f96c04ee..6bcff73b 100644
--- a/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java
+++ b/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java
@@ -152,7 +152,9 @@ public class TrampolineActivity extends Activity {
@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
- getActivity().finish();
+ if (getActivity() != null) {
+ getActivity().finish();
+ }
}
}
@@ -221,7 +223,9 @@ public class TrampolineActivity extends Activity {
@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
- getActivity().finish();
+ if (getActivity() != null) {
+ getActivity().finish();
+ }
}
}
}