Update support lib to last released state

customtabs/src/android/support/customtabs/CustomTabsService.java

 /*
  * Copyright (C) 2015 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 package android.support.customtabs;
 
 import android.app.Service;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.IBinder.DeathRecipient;
 import android.os.RemoteException;
-import android.util.ArrayMap;
+import android.support.v4.util.ArrayMap;
 
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
 /**
  * Abstract service class for implementing Custom Tabs related functionality. The service should
  * be responding to the action ACTION_CUSTOM_TABS_CONNECTION. This class should be used by
  * implementers that want to provide Custom Tabs functionality, not by clients that want to launch
  * Custom Tabs.
@@ skipping 46 matching lines @@
          public boolean mayLaunchUrl(ICustomTabsCallback callback, Uri url,
                          Bundle extras, List<Bundle> otherLikelyBundles) {
              return CustomTabsService.this.mayLaunchUrl(
                      new CustomTabsSessionToken(callback), url, extras, otherLikelyBundles);
          }
 
          @Override
          public Bundle extraCommand(String commandName, Bundle args) {
              return CustomTabsService.this.extraCommand(commandName, args);
          }
+
+         @Override
+         public boolean updateVisuals(ICustomTabsCallback callback, Bundle bundle) {
+             return CustomTabsService.this.updateVisuals(
+                     new CustomTabsSessionToken(callback), bundle);
+         }
      };
 
      @Override
      public IBinder onBind(Intent intent) {
          return mBinder;
      }
 
      /**
       * Called when the client side {@link IBinder} for this {@link CustomTabsSessionToken} is dead.
       * Can also be used to clean up {@link DeathRecipient} instances allocated for the given token.
@@ skipping 66 matching lines @@
       * defined behavior, as it is entirely implementation-defined and not supported.
       *
       * <p> This call can be used by implementations to add extra commands, for testing or
       * experimental purposes.
       *
       * @param commandName Name of the extra command to execute.
       * @param args Arguments for the command
       * @return The result {@link Bundle}, or null.
       */
      protected abstract Bundle extraCommand(String commandName, Bundle args);
+
+    /**
+     * Updates the visuals of custom tabs for the given session. Will only succeed if the given
+     * session matches the currently active one.
+     * @param sessionToken The currently active session that the custom tab belongs to.
+     * @param bundle       The action button configuration bundle. This bundle should be constructed
+     *                     with the same structure in {@link CustomTabsIntent.Builder}.
+     * @return Whether the operation was successful.
+     */
+     protected abstract boolean updateVisuals(CustomTabsSessionToken sessionToken,
+             Bundle bundle);
  }