commit 4e1ab1e72d4984208eb3e2a58a46e622b82fcc94
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 12 17:32:28 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 12 17:32:29 2017 +0000
tree c5ee2af7eeb37176ab81a2998c5875ce85479f4f
parent 63fa4021f4163186dfade8955444915662275466
parent b0ba50d6f1c8f7fabe3ff8c58ad43a3516fff80e

Merge "Better API change management" into oc-dev

media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java

diff --git a/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java b/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java
index fc6444a..4b2903a 100644
--- a/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java
+++ b/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java
@@ -117,8 +117,9 @@
         @Override
         public MediaBrowserService.BrowserRoot onGetRoot(String clientPackageName, int clientUid,
                 Bundle rootHints) {
+            Bundle copiedRootHints = rootHints == null ? null : new Bundle(rootHints);
             MediaBrowserServiceCompatApi21.BrowserRoot browserRoot = mServiceProxy.onGetRoot(
-                    clientPackageName, clientUid, new Bundle(rootHints));
+                    clientPackageName, clientUid, copiedRootHints);
             return browserRoot == null ? null : new MediaBrowserService.BrowserRoot(
                     browserRoot.mRootId, browserRoot.mExtras);
         }