From b759bd3b4add402ac54e008de0d59bed94abefc7 Mon Sep 17 00:00:00 2001 From: Ian Lake Date: Tue, 18 Apr 2017 10:42:50 -0700 Subject: Create a valid ActivityOptions Bundle even for default animations The ActivityOptions bundle can hold additional information beyond the animation details (such as the usage time report, launch, display id, etc). We need to return a non-null Bundle even if we're using the default animations to retain that information. Test: Added in 8209c4bf BUG: 34235073 Change-Id: If69edadb3f7ff937f07fc618bddbd10cf46666e6 --- core/java/android/app/ActivityOptions.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'core/java/android/app/ActivityOptions.java') 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); -- cgit v1.2.3