diff options
author | Jeff Sharkey <jsharkey@android.com> | 2016-01-05 16:17:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-05 16:17:09 +0000 |
commit | 346dce7cd3caef58dd70766cb919e65e5cdee4fe (patch) | |
tree | a044a584cbd52f64ded0ca68bed844da42a35e37 | |
parent | 7722fd91ff7aed72eb7558271b1602dfc5820554 (diff) | |
parent | 27cb48d40e85d207b66a34cd0ae85edcfeeebaf9 (diff) | |
download | android_packages_providers_DownloadProvider-346dce7cd3caef58dd70766cb919e65e5cdee4fe.tar.gz android_packages_providers_DownloadProvider-346dce7cd3caef58dd70766cb919e65e5cdee4fe.tar.bz2 android_packages_providers_DownloadProvider-346dce7cd3caef58dd70766cb919e65e5cdee4fe.zip |
Merge "NullPointerException on activity in onDismiss" am: 2075de92c6
am: 27cb48d40e
* commit '27cb48d40e85d207b66a34cd0ae85edcfeeebaf9':
NullPointerException on activity in onDismiss
-rw-r--r-- | ui/src/com/android/providers/downloads/ui/TrampolineActivity.java | 10 |
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(); + } } } } |