summaryrefslogtreecommitdiffstats
path: root/ui/src/com/android
diff options
context:
space:
mode:
authorMichal Szynkaruk <michal.szynkaruk@sonymobile.com>2015-06-10 18:27:04 +0200
committerZoran Jovanovic <zoran.jovanovic@sonymobile.com>2015-12-16 16:15:17 +0100
commit9a49799c782b632533316ef7f9d6e446c31eb512 (patch)
treea1716e95a2a71e068f6a06e9f9c0415d688685e1 /ui/src/com/android
parent4920a49117cc2bf7df4093a00bbf108c675a25ed (diff)
downloadandroid_packages_providers_DownloadProvider-9a49799c782b632533316ef7f9d6e446c31eb512.tar.gz
android_packages_providers_DownloadProvider-9a49799c782b632533316ef7f9d6e446c31eb512.tar.bz2
android_packages_providers_DownloadProvider-9a49799c782b632533316ef7f9d6e446c31eb512.zip
NullPointerException on activity in onDismiss
Problem: getActivity() returns NULL after the dialog fragment has been removed. Solution: Add a null check for the activity to which the dialogfragment is attached. Change-Id: I32c8784b15b6f179d13071b508d6cd9d2013ebc3
Diffstat (limited to 'ui/src/com/android')
-rw-r--r--ui/src/com/android/providers/downloads/ui/TrampolineActivity.java10
1 files changed, 8 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..104f144c 100644
--- a/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java
+++ b/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java
@@ -152,7 +152,10 @@ public class TrampolineActivity extends Activity {
@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
- getActivity().finish();
+ final Activity activity = getActivity();
+ if (activity != null) {
+ activity.finish();
+ }
}
}
@@ -221,7 +224,10 @@ public class TrampolineActivity extends Activity {
@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
- getActivity().finish();
+ final Activity activity = getActivity();
+ if (activity != null) {
+ activity.finish();
+ }
}
}
}