Merge "Fix Action Mode close item styling" into nyc-support-25.2-dev
diff --git a/fragment/java/android/support/v4/app/FragmentManager.java b/fragment/java/android/support/v4/app/FragmentManager.java
index e7d13ff..ecc24d0 100644
--- a/fragment/java/android/support/v4/app/FragmentManager.java
+++ b/fragment/java/android/support/v4/app/FragmentManager.java
@@ -2355,7 +2355,10 @@
final int stateAfterAnimating = fragment.getStateAfterAnimating();
final View animatingAway = fragment.getAnimatingAway();
fragment.setAnimatingAway(null);
- animatingAway.clearAnimation();
+ Animation animation = animatingAway.getAnimation();
+ if (animation != null) {
+ animation.cancel();
+ }
moveToState(fragment, stateAfterAnimating, 0, 0, false);
}
}
diff --git a/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java b/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java
index affb130..4035e63 100644
--- a/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java
+++ b/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java
@@ -71,6 +71,7 @@
mResultObj.sendResult(parcelListToItemList((List<Parcel>)result));
} else if (result instanceof Parcel) {
Parcel parcel = (Parcel) result;
+ parcel.setDataPosition(0);
mResultObj.sendResult(MediaBrowser.MediaItem.CREATOR.createFromParcel(parcel));
parcel.recycle();
} else {
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
index a9fc7e8..de5047b 100644
--- a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
@@ -403,6 +403,11 @@
@Override
public Bundle getBrowserRootHints() {
+ // If EXTRA_MESSENGER_BINDER is used, mCurConnection is not null.
+ if (mCurConnection != null) {
+ return mCurConnection.rootHints == null ? null
+ : new Bundle(mCurConnection.rootHints);
+ }
return MediaBrowserServiceCompatApi24.getBrowserRootHints(mServiceObj);
}
}