Revert "Revert "MediaBrowser: Add the "Compat" postfix""

This reverts commit de9762d01d444a32d3d6f22e545e39e8e03dbd4e.
Also fixes minor Java doc issues.

Change-Id: I663f224d6a90f6804e09107d2eede1d4f98d713c
diff --git a/v4/java/android/support/v4/media/IMediaBrowserService.aidl b/v4/java/android/support/v4/media/IMediaBrowserService.aidl
deleted file mode 100644
index 01516fd..0000000
--- a/v4/java/android/support/v4/media/IMediaBrowserService.aidl
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 Google Inc. All Rights Reserved.
-
-package android.support.v4.media;
-
-import android.content.res.Configuration;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.media.IMediaBrowserServiceCallbacks;
-import android.support.v4.os.ResultReceiver;
-
-/**
- * Media API allows clients to browse through hierarchy of a user’s media collection,
- * playback a specific media entry and interact with the now playing queue.
- * @hide
- */
-oneway interface IMediaBrowserService {
-    void connect(String pkg, in Bundle rootHints, IMediaBrowserServiceCallbacks callbacks);
-    void disconnect(IMediaBrowserServiceCallbacks callbacks);
-
-    void addSubscription(String uri, IMediaBrowserServiceCallbacks callbacks);
-    void removeSubscription(String uri, IMediaBrowserServiceCallbacks callbacks);
-    void getMediaItem(String uri, in ResultReceiver cb);
-}
\ No newline at end of file
diff --git a/v4/java/android/support/v4/media/IMediaBrowserServiceCallbacks.aidl b/v4/java/android/support/v4/media/IMediaBrowserServiceCallbacks.aidl
deleted file mode 100644
index 6e46968..0000000
--- a/v4/java/android/support/v4/media/IMediaBrowserServiceCallbacks.aidl
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015 Google Inc. All Rights Reserved.
-
-package android.support.v4.media;
-
-import android.graphics.Bitmap;
-import android.support.v4.media.session.MediaSessionCompat;
-import android.os.Bundle;
-
-import java.util.List;
-
-/**
- * Media API allows clients to browse through hierarchy of a user’s media collection,
- * playback a specific media entry and interact with the now playing queue.
- * @hide
- */
-oneway interface IMediaBrowserServiceCallbacks {
-    /**
-     * Invoked when the connected has been established.
-     * @param root The root media id for browsing.
-     * @param session The {@link MediaSession.Token media session token} that can be used to control
-     *         the playback of the media app.
-     * @param extra Extras returned by the media service.
-     */
-    void onConnect(String root, in MediaSessionCompat.Token session, in Bundle extras);
-    void onConnectFailed();
-    void onLoadChildren(String mediaId, in List list);
-}
diff --git a/v4/java/android/support/v4/media/IMediaBrowserServiceCompat.aidl b/v4/java/android/support/v4/media/IMediaBrowserServiceCompat.aidl
new file mode 100644
index 0000000..05012b6
--- /dev/null
+++ b/v4/java/android/support/v4/media/IMediaBrowserServiceCompat.aidl
@@ -0,0 +1,37 @@
+/*
+** Copyright 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.v4.media;
+
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.media.IMediaBrowserServiceCompatCallbacks;
+import android.support.v4.os.ResultReceiver;
+
+/**
+ * Media API allows clients to browse through hierarchy of a user’s media collection,
+ * playback a specific media entry and interact with the now playing queue.
+ * @hide
+ */
+oneway interface IMediaBrowserServiceCompat {
+    void connect(String pkg, in Bundle rootHints, IMediaBrowserServiceCompatCallbacks callbacks);
+    void disconnect(IMediaBrowserServiceCompatCallbacks callbacks);
+
+    void addSubscription(String uri, IMediaBrowserServiceCompatCallbacks callbacks);
+    void removeSubscription(String uri, IMediaBrowserServiceCompatCallbacks callbacks);
+    void getMediaItem(String uri, in ResultReceiver cb);
+}
\ No newline at end of file
diff --git a/v4/java/android/support/v4/media/IMediaBrowserServiceCompatCallbacks.aidl b/v4/java/android/support/v4/media/IMediaBrowserServiceCompatCallbacks.aidl
new file mode 100644
index 0000000..d191123
--- /dev/null
+++ b/v4/java/android/support/v4/media/IMediaBrowserServiceCompatCallbacks.aidl
@@ -0,0 +1,41 @@
+/*
+** Copyright 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.v4.media;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.v4.media.session.MediaSessionCompat;
+
+import java.util.List;
+
+/**
+ * Media API allows clients to browse through hierarchy of a user’s media collection,
+ * playback a specific media entry and interact with the now playing queue.
+ * @hide
+ */
+oneway interface IMediaBrowserServiceCompatCallbacks {
+    /**
+     * Invoked when the connected has been established.
+     * @param root The root media id for browsing.
+     * @param session The {@link MediaSessionCompat.Token media session token} that can be used to
+     *         control the playback of the media app.
+     * @param extra Extras returned by the media service.
+     */
+    void onConnect(String root, in MediaSessionCompat.Token session, in Bundle extras);
+    void onConnectFailed();
+    void onLoadChildren(String mediaId, in List list);
+}
diff --git a/v4/java/android/support/v4/media/MediaBrowser.java b/v4/java/android/support/v4/media/MediaBrowserCompat.java
similarity index 94%
rename from v4/java/android/support/v4/media/MediaBrowser.java
rename to v4/java/android/support/v4/media/MediaBrowserCompat.java
index 27be143..b4559b0 100644
--- a/v4/java/android/support/v4/media/MediaBrowser.java
+++ b/v4/java/android/support/v4/media/MediaBrowserCompat.java
@@ -29,8 +29,8 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.media.IMediaBrowserService;
-import android.support.v4.media.IMediaBrowserServiceCallbacks;
+import android.support.v4.media.IMediaBrowserServiceCompat;
+import android.support.v4.media.IMediaBrowserServiceCompatCallbacks;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.os.ResultReceiver;
 import android.support.v4.util.ArrayMap;
@@ -44,15 +44,15 @@
 import java.util.List;
 
 /**
- * Browses media content offered by a link MediaBrowserService.
+ * Browses media content offered by a {@link MediaBrowserServiceCompat}.
  * <p>
  * This object is not thread-safe. All calls should happen on the thread on which the browser
  * was constructed.
  * </p>
  * @hide
  */
-public final class MediaBrowser {
-    private static final String TAG = "MediaBrowser";
+public final class MediaBrowserCompat {
+    private static final String TAG = "MediaBrowserCompat";
     private static final boolean DBG = false;
 
     private static final int CONNECT_STATE_DISCONNECTED = 0;
@@ -66,12 +66,12 @@
     private final Bundle mRootHints;
     private final Handler mHandler = new Handler();
     private final ArrayMap<String,Subscription> mSubscriptions =
-            new ArrayMap<String, MediaBrowser.Subscription>();
+            new ArrayMap<String, MediaBrowserCompat.Subscription>();
 
     private int mState = CONNECT_STATE_DISCONNECTED;
     private MediaServiceConnection mServiceConnection;
-    private IMediaBrowserService mServiceBinder;
-    private IMediaBrowserServiceCallbacks mServiceCallbacks;
+    private IMediaBrowserServiceCompat mServiceBinder;
+    private IMediaBrowserServiceCompatCallbacks mServiceCallbacks;
     private String mRootId;
     private MediaSessionCompat.Token mMediaSessionToken;
     private Bundle mExtras;
@@ -87,7 +87,7 @@
      * for browsing, or null if none.  The contents of this bundle may affect
      * the information returned when browsing.
      */
-    public MediaBrowser(Context context, ComponentName serviceComponent,
+    public MediaBrowserCompat(Context context, ComponentName serviceComponent,
             ConnectionCallback callback, Bundle rootHints) {
         if (context == null) {
             throw new IllegalArgumentException("context must not be null");
@@ -134,7 +134,7 @@
 
         mState = CONNECT_STATE_CONNECTING;
 
-        final Intent intent = new Intent(MediaBrowserService.SERVICE_INTERFACE);
+        final Intent intent = new Intent(MediaBrowserServiceCompat.SERVICE_INTERFACE);
         intent.setComponent(mServiceComponent);
 
         final ServiceConnection thisConnection = mServiceConnection = new MediaServiceConnection();
@@ -395,11 +395,12 @@
             @Override
             protected void onReceiveResult(int resultCode, Bundle resultData) {
                 if (resultCode != 0 || resultData == null
-                        || !resultData.containsKey(MediaBrowserService.KEY_MEDIA_ITEM)) {
+                        || !resultData.containsKey(MediaBrowserServiceCompat.KEY_MEDIA_ITEM)) {
                     cb.onError(mediaId);
                     return;
                 }
-                Parcelable item = resultData.getParcelable(MediaBrowserService.KEY_MEDIA_ITEM);
+                Parcelable item =
+                        resultData.getParcelable(MediaBrowserServiceCompat.KEY_MEDIA_ITEM);
                 if (!(item instanceof MediaItem)) {
                     cb.onError(mediaId);
                     return;
@@ -438,7 +439,7 @@
         }
     }
 
-    private final void onServiceConnected(final IMediaBrowserServiceCallbacks callback,
+    private final void onServiceConnected(final IMediaBrowserServiceCompatCallbacks callback,
             final String root, final MediaSessionCompat.Token session, final Bundle extra) {
         mHandler.post(new Runnable() {
             @Override
@@ -480,7 +481,7 @@
         });
     }
 
-    private final void onConnectionFailed(final IMediaBrowserServiceCallbacks callback) {
+    private final void onConnectionFailed(final IMediaBrowserServiceCompatCallbacks callback) {
         mHandler.post(new Runnable() {
             @Override
             public void run() {
@@ -507,7 +508,7 @@
         });
     }
 
-    private final void onLoadChildren(final IMediaBrowserServiceCallbacks callback,
+    private final void onLoadChildren(final IMediaBrowserServiceCompatCallbacks callback,
             final String parentId, final List list) {
         mHandler.post(new Runnable() {
             @Override
@@ -545,7 +546,7 @@
     /**
      * Return true if {@code callback} is the current ServiceCallbacks.  Also logs if it's not.
      */
-    private boolean isCurrent(IMediaBrowserServiceCallbacks callback, String funcName) {
+    private boolean isCurrent(IMediaBrowserServiceCompatCallbacks callback, String funcName) {
         if (mServiceCallbacks != callback) {
             if (mState != CONNECT_STATE_DISCONNECTED) {
                 Log.i(TAG, funcName + " for " + mServiceComponent + " with mServiceConnection="
@@ -565,7 +566,7 @@
      * @hide
      */
     void dump() {
-        Log.d(TAG, "MediaBrowser...");
+        Log.d(TAG, "MediaBrowserCompat...");
         Log.d(TAG, "  mServiceComponent=" + mServiceComponent);
         Log.d(TAG, "  mCallback=" + mCallback);
         Log.d(TAG, "  mRootHints=" + mRootHints);
@@ -703,7 +704,8 @@
      */
     public static class ConnectionCallback {
         /**
-         * Invoked after {@link MediaBrowser#connect()} when the request has successfully completed.
+         * Invoked after {@link MediaBrowserCompat#connect()} when the request has successfully
+         * completed.
          */
         public void onConnected() {
         }
@@ -738,7 +740,7 @@
         /**
          * Called when the id doesn't exist or other errors in subscribing.
          * <p>
-         * If this is called, the subscription remains until {@link MediaBrowser#unsubscribe}
+         * If this is called, the subscription remains until {@link MediaBrowserCompat#unsubscribe}
          * called, because some errors may heal themselves.
          * </p>
          *
@@ -789,7 +791,7 @@
             }
 
             // Save their binder
-            mServiceBinder = IMediaBrowserService.Stub.asInterface(binder);
+            mServiceBinder = IMediaBrowserServiceCompat.Stub.asInterface(binder);
 
             // We make a new mServiceCallbacks each time we connect so that we can drop
             // responses from previous connections.
@@ -858,11 +860,11 @@
     /**
      * Callbacks from the service.
      */
-    private static class ServiceCallbacks extends IMediaBrowserServiceCallbacks.Stub {
-        private WeakReference<MediaBrowser> mMediaBrowser;
+    private static class ServiceCallbacks extends IMediaBrowserServiceCompatCallbacks.Stub {
+        private WeakReference<MediaBrowserCompat> mMediaBrowser;
 
-        public ServiceCallbacks(MediaBrowser mediaBrowser) {
-            mMediaBrowser = new WeakReference<MediaBrowser>(mediaBrowser);
+        public ServiceCallbacks(MediaBrowserCompat mediaBrowser) {
+            mMediaBrowser = new WeakReference<MediaBrowserCompat>(mediaBrowser);
         }
 
         /**
@@ -872,7 +874,7 @@
         @Override
         public void onConnect(final String root, final MediaSessionCompat.Token session,
                 final Bundle extras) {
-            MediaBrowser mediaBrowser = mMediaBrowser.get();
+            MediaBrowserCompat mediaBrowser = mMediaBrowser.get();
             if (mediaBrowser != null) {
                 mediaBrowser.onServiceConnected(this, root, session, extras);
             }
@@ -883,7 +885,7 @@
          */
         @Override
         public void onConnectFailed() {
-            MediaBrowser mediaBrowser = mMediaBrowser.get();
+            MediaBrowserCompat mediaBrowser = mMediaBrowser.get();
             if (mediaBrowser != null) {
                 mediaBrowser.onConnectionFailed(this);
             }
@@ -891,7 +893,7 @@
 
         @Override
         public void onLoadChildren(final String parentId, final List list) {
-            MediaBrowser mediaBrowser = mMediaBrowser.get();
+            MediaBrowserCompat mediaBrowser = mMediaBrowser.get();
             if (mediaBrowser != null) {
                 mediaBrowser.onLoadChildren(this, parentId, list);
             }
diff --git a/v4/java/android/support/v4/media/MediaBrowserService.java b/v4/java/android/support/v4/media/MediaBrowserServiceCompat.java
similarity index 90%
rename from v4/java/android/support/v4/media/MediaBrowserService.java
rename to v4/java/android/support/v4/media/MediaBrowserServiceCompat.java
index d32e70b..d8cd79e 100644
--- a/v4/java/android/support/v4/media/MediaBrowserService.java
+++ b/v4/java/android/support/v4/media/MediaBrowserServiceCompat.java
@@ -26,8 +26,8 @@
 import android.os.RemoteException;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.media.IMediaBrowserService;
-import android.support.v4.media.IMediaBrowserServiceCallbacks;
+import android.support.v4.media.IMediaBrowserServiceCompat;
+import android.support.v4.media.IMediaBrowserServiceCompatCallbacks;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.os.ResultReceiver;
 import android.support.v4.util.ArrayMap;
@@ -44,7 +44,7 @@
  * <p>
  * Media browse services enable applications to browse media content provided by an application
  * and ask the application to start playing it.  They may also be used to control content that
- * is already playing by way of a {@link MediaSession}.
+ * is already playing by way of a {@link MediaSessionCompat}.
  * </p>
  *
  * To extend this class, you must declare the service in your manifest file with
@@ -52,23 +52,23 @@
  *
  * For example:
  * </p><pre>
- * &lt;service android:name=".MyMediaBrowserService"
+ * &lt;service android:name=".MyMediaBrowserServiceCompat"
  *          android:label="&#64;string/service_name" >
  *     &lt;intent-filter>
- *         &lt;action android:name="android.media.browse.MediaBrowserService" />
+ *         &lt;action android:name="android.media.browse.MediaBrowserServiceCompat" />
  *     &lt;/intent-filter>
  * &lt;/service>
  * </pre>
  * @hide
  */
-public abstract class MediaBrowserService extends Service {
-    private static final String TAG = "MediaBrowserService";
+public abstract class MediaBrowserServiceCompat extends Service {
+    private static final String TAG = "MediaBrowserServiceCompat";
     private static final boolean DBG = false;
 
     /**
      * The {@link Intent} that must be declared as handled by the service.
      */
-    public static final String SERVICE_INTERFACE = "android.media.browse.MediaBrowserService";
+    public static final String SERVICE_INTERFACE = "android.media.browse.MediaBrowserServiceCompat";
 
     /**
      * A key for passing the MediaItem to the ResultReceiver in getItem.
@@ -88,13 +88,13 @@
     private class ConnectionRecord {
         String pkg;
         Bundle rootHints;
-        IMediaBrowserServiceCallbacks callbacks;
+        IMediaBrowserServiceCompatCallbacks callbacks;
         BrowserRoot root;
         HashSet<String> subscriptions = new HashSet();
     }
 
     /**
-     * Completion handler for asynchronous callback methods in {@link MediaBrowserService}.
+     * Completion handler for asynchronous callback methods in {@link MediaBrowserServiceCompat}.
      * <p>
      * Each of the methods that takes one of these to send the result must call
      * {@link #sendResult} to respond to the caller with the given results.  If those
@@ -103,8 +103,8 @@
      * they are done.  If more than one of those methods is called, an exception will
      * be thrown.
      *
-     * @see MediaBrowserService#onLoadChildren
-     * @see MediaBrowserService#onGetMediaItem
+     * @see MediaBrowserServiceCompat#onLoadChildren
+     * @see MediaBrowserServiceCompat#onLoadItem
      */
     public class Result<T> {
         private Object mDebug;
@@ -154,10 +154,10 @@
         }
     }
 
-    private class ServiceBinder extends IMediaBrowserService.Stub {
+    private class ServiceBinder extends IMediaBrowserServiceCompat.Stub {
         @Override
         public void connect(final String pkg, final Bundle rootHints,
-                final IMediaBrowserServiceCallbacks callbacks) {
+                final IMediaBrowserServiceCompatCallbacks callbacks) {
 
             final int uid = Binder.getCallingUid();
             if (!isValidPackage(pkg, uid)) {
@@ -178,7 +178,8 @@
                         connection.rootHints = rootHints;
                         connection.callbacks = callbacks;
 
-                        connection.root = MediaBrowserService.this.onGetRoot(pkg, uid, rootHints);
+                        connection.root =
+                                MediaBrowserServiceCompat.this.onGetRoot(pkg, uid, rootHints);
 
                         // If they didn't return something, don't allow this client.
                         if (connection.root == null) {
@@ -208,7 +209,7 @@
         }
 
         @Override
-        public void disconnect(final IMediaBrowserServiceCallbacks callbacks) {
+        public void disconnect(final IMediaBrowserServiceCompatCallbacks callbacks) {
             mHandler.post(new Runnable() {
                     @Override
                     public void run() {
@@ -225,7 +226,8 @@
 
 
         @Override
-        public void addSubscription(final String id, final IMediaBrowserServiceCallbacks callbacks) {
+        public void addSubscription(
+                final String id, final IMediaBrowserServiceCompatCallbacks callbacks) {
             mHandler.post(new Runnable() {
                     @Override
                     public void run() {
@@ -239,14 +241,14 @@
                             return;
                         }
 
-                        MediaBrowserService.this.addSubscription(id, connection);
+                        MediaBrowserServiceCompat.this.addSubscription(id, connection);
                     }
                 });
         }
 
         @Override
         public void removeSubscription(final String id,
-                final IMediaBrowserServiceCallbacks callbacks) {
+                final IMediaBrowserServiceCompatCallbacks callbacks) {
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
@@ -337,7 +339,7 @@
      *            id is invalid.
      */
     public abstract void onLoadChildren(@NonNull String parentId,
-            @NonNull Result<List<MediaBrowser.MediaItem>> result);
+            @NonNull Result<List<MediaBrowserCompat.MediaItem>> result);
 
     /**
      * Called to get information about a specific media item.
@@ -351,11 +353,11 @@
      * The default implementation sends a null result.
      *
      * @param itemId The id for the specific
-     *            {@link android.media.browse.MediaBrowser.MediaItem}.
+     *            {@link MediaBrowserCompat.MediaItem}.
      * @param result The Result to send the item to, or null if the id is
      *            invalid.
      */
-    public void onLoadItem(String itemId, Result<MediaBrowser.MediaItem> result) {
+    public void onLoadItem(String itemId, Result<MediaBrowserCompat.MediaItem> result) {
         result.sendResult(null);
     }
 
@@ -365,7 +367,7 @@
      * This should be called as soon as possible during the service's startup.
      * It may only be called once.
      *
-     * @param token The token for the service's {@link MediaSession}.
+     * @param token The token for the service's {@link MediaSessionCompat}.
      */
     public void setSessionToken(final MediaSessionCompat.Token token) {
         if (token == null) {
@@ -460,10 +462,10 @@
      * Callers must make sure that this connection is still connected.
      */
     private void performLoadChildren(final String parentId, final ConnectionRecord connection) {
-        final Result<List<MediaBrowser.MediaItem>> result
-                = new Result<List<MediaBrowser.MediaItem>>(parentId) {
+        final Result<List<MediaBrowserCompat.MediaItem>> result
+                = new Result<List<MediaBrowserCompat.MediaItem>>(parentId) {
             @Override
-            void onResultSent(List<MediaBrowser.MediaItem> list) {
+            void onResultSent(List<MediaBrowserCompat.MediaItem> list) {
                 if (list == null) {
                     throw new IllegalStateException("onLoadChildren sent null list for id "
                             + parentId);
@@ -495,17 +497,17 @@
     }
 
     private void performLoadItem(String itemId, final ResultReceiver receiver) {
-        final Result<MediaBrowser.MediaItem> result =
-                new Result<MediaBrowser.MediaItem>(itemId) {
+        final Result<MediaBrowserCompat.MediaItem> result =
+                new Result<MediaBrowserCompat.MediaItem>(itemId) {
             @Override
-            void onResultSent(MediaBrowser.MediaItem item) {
+            void onResultSent(MediaBrowserCompat.MediaItem item) {
                 Bundle bundle = new Bundle();
                 bundle.putParcelable(KEY_MEDIA_ITEM, item);
                 receiver.send(0, bundle);
             }
         };
 
-        MediaBrowserService.this.onLoadItem(itemId, result);
+        MediaBrowserServiceCompat.this.onLoadItem(itemId, result);
 
         if (!result.isDone()) {
             throw new IllegalStateException("onLoadItem must call detach() or sendResult()"
diff --git a/v4/java/android/support/v4/os/IResultReceiver.aidl b/v4/java/android/support/v4/os/IResultReceiver.aidl
index 5e5e626..cd23ff3 100644
--- a/v4/java/android/support/v4/os/IResultReceiver.aidl
+++ b/v4/java/android/support/v4/os/IResultReceiver.aidl
@@ -1,17 +1,16 @@
-/* //device/java/android/android/app/IActivityPendingResult.aidl
-**
+/*
 ** Copyright 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 
+** 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 
+**     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 
+** 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.
 */
 
diff --git a/v4/java/android/support/v4/os/ResultReceiver.aidl b/v4/java/android/support/v4/os/ResultReceiver.aidl
index 4a8268c..81c81f6 100644
--- a/v4/java/android/support/v4/os/ResultReceiver.aidl
+++ b/v4/java/android/support/v4/os/ResultReceiver.aidl
@@ -1,17 +1,16 @@
-/* //device/java/android/android/os/ParcelFileDescriptor.aidl
-**
+/*
 ** Copyright 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 
+** 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 
+**     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 
+** 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.
 */