diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-01-05 16:15:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-05 16:15:21 +0000 |
| commit | 27cb48d40e85d207b66a34cd0ae85edcfeeebaf9 (patch) | |
| tree | 638c6f7b158ba2c1d10630abbb958d7af1a50944 /ui | |
| parent | b68997d5b9f6e1700255defde9fce79604256ac2 (diff) | |
| parent | 2075de92c6b75ffcf7b57cb25947d08daf57772a (diff) | |
| download | android_packages_providers_DownloadProvider-27cb48d40e85d207b66a34cd0ae85edcfeeebaf9.tar.gz android_packages_providers_DownloadProvider-27cb48d40e85d207b66a34cd0ae85edcfeeebaf9.tar.bz2 android_packages_providers_DownloadProvider-27cb48d40e85d207b66a34cd0ae85edcfeeebaf9.zip | |
Merge "NullPointerException on activity in onDismiss"
am: 2075de92c6
* commit '2075de92c6b75ffcf7b57cb25947d08daf57772a':
NullPointerException on activity in onDismiss
Diffstat (limited to 'ui')
| -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(); + } } } } |