summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ian Lake <ilake@google.com> 2017-04-19 21:39:49 +0000
committer android-build-merger <android-build-merger@google.com> 2017-04-19 21:39:49 +0000
commitd85e60aa467b6acee006bd14d5f8fe1b6cb5273f (patch)
tree7159e8606a1975eb6786d3ba0e22cb3967898a5b
parent594f401e26a82719154136729402e969a83f6cc8 (diff)
parentb759bd3b4add402ac54e008de0d59bed94abefc7 (diff)
Create a valid ActivityOptions Bundle even for default animations
am: b759bd3b4a Change-Id: Ib9b61f2bf4ac6b6001664ebbc40d115089e75326
-rw-r--r--core/java/android/app/ActivityOptions.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index 02d18841f489..63e8cc641ce9 100644
--- a/core/java/android/app/ActivityOptions.java
+++ b/core/java/android/app/ActivityOptions.java
@@ -1211,9 +1211,6 @@ public class ActivityOptions {
* methods that take an options Bundle.
*/
public Bundle toBundle() {
- if (mAnimationType == ANIM_DEFAULT) {
- return null;
- }
Bundle b = new Bundle();
if (mPackageName != null) {
b.putString(KEY_PACKAGE_NAME, mPackageName);