Projects >> android_frameworks_base >>7e2b4f602a1a876475da2756c5b92297552e0bc8

Chunk
Conflicting content 
     * @param url URL string.
     * @param headers The headers associated with the request. May be null.
     * @return The CacheResult containing the surrogate response.
<<<<<<< HEAD
     *
     * @deprecated Do not use, this interface is deprecated.
=======
     * @deprecated Use PluginData getPluginData(String url,
     * Map headers); instead
>>>>>>> 2b63ff51d5202eb2b458e937d4b65b326238733e
     */
    @Deprecated
    public CacheResult service(String url, Map headers);
Solution content 
     * @param url URL string.
     * @param headers The headers associated with the request. May be null.
     * @return The CacheResult containing the surrogate response.
     *
     * @deprecated Do not use, this interface is deprecated.
     */
    @Deprecated
    public CacheResult service(String url, Map headers);
File
UrlInterceptHandler.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
     * UrlInterceptHandler interested, or null if none are.
     *
     * @return A CacheResult containing surrogate content.
<<<<<<< HEAD
     *
     * Map headers) instead.
>>>>>>> 2b63ff51d5202eb2b458e937d4b65b326238733e
     */
    @Deprecated
     * deprecated, so is this class.
=======
    public static synchronized CacheResult getSurrogate(
     * @deprecated Use PluginData getPluginData( String url,
     * @deprecated This class was intended to be used by Gears. Since Gears was
Solution content 
     * UrlInterceptHandler interested, or null if none are.
     *
     * @return A CacheResult containing surrogate content.
     *
     * @deprecated This class was intended to be used by Gears. Since Gears was
     * deprecated, so is this class.
     */
    @Deprecated
    public static synchronized CacheResult getSurrogate(
File
UrlInterceptRegistry.java
Developer's decision
Version 1
Kind of conflict
Comment