Projects >> android-frameworks-base >>478de466ce0504b9af639c3338b883893670a8e8

Chunk
Conflicting content 
     */
    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
    public static final String ACTION_POWER_DISCONNECTED =
<<<<<<< HEAD
            "android.intent.action.ACTION_POWER_DISCONNECTED";    
=======
            "android.intent.action.ACTION_POWER_DISCONNECTED";
>>>>>>> 9db3d07b9620b4269ab33f78604a36327e536ce1
    /**
     * Broadcast Action:  Device is shutting down.
     * This is broadcast when the device is being shut down (completely turned
Solution content 
     */
    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
    public static final String ACTION_POWER_DISCONNECTED =
            "android.intent.action.ACTION_POWER_DISCONNECTED";
    /**
     * Broadcast Action:  Device is shutting down.
     * This is broadcast when the device is being shut down (completely turned
File
Intent.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
    @Deprecated
     * @param url URL string.
     * @param headers The headers associated with the request. May be null.
     * @return The CacheResult containing the surrogate response.
<<<<<<< HEAD
     * @deprecated Use PluginData getPluginData(String url,
     * Map headers); instead
=======
     *
     * @deprecated Do not use, this interface is deprecated.
>>>>>>> 9db3d07b9620b4269ab33f78604a36327e536ce1
     */
    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 2
Kind of conflict
Comment
Chunk
Conflicting content 
     * UrlInterceptHandler interested, or null if none are.
     *
     * @return A CacheResult containing surrogate content.
<<<<<<< HEAD
     * @deprecated Use PluginData getPluginData( String url,
     * Map headers) instead.
=======
     *
     * @deprecated This class was intended to be used by Gears. Since Gears was
     * deprecated, so is this class.
>>>>>>> 9db3d07b9620b4269ab33f78604a36327e536ce1
     */
    @Deprecated
    public static synchronized CacheResult getSurrogate(
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 2
Kind of conflict
Comment
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
=======
     * Call this to pause any extra processing associated with this view and
     * its associated DOM/plugins/javascript/etc. For example, if the view is
     * taken offscreen, this could be called to reduce unnecessary CPU and/or
     * network traffic. When the view is again "active", call onResume().
     *
     * Note that this differs from pauseTimers(), which affects all views/DOMs
     * @hide
     */
    public void onPause() {
        if (!mIsPaused) {
            mIsPaused = true;
            mWebViewCore.sendMessage(EventHub.ON_PAUSE);
        }
    }

    /**
     * Call this to balanace a previous call to onPause()
     * @hide
     */
    public void onResume() {
        if (mIsPaused) {
            mIsPaused = false;
            mWebViewCore.sendMessage(EventHub.ON_RESUME);
        }
    }

    /**
     * Returns true if the view is paused, meaning onPause() was called. Calling
     * onResume() sets the paused state back to false.
     * @hide
     */
    public boolean isPaused() {
        return mIsPaused;
    }

    /**
     * Call this to inform the view that memory is low so that it can
     * free any available memory.
     */
    public void freeMemory() {
        mWebViewCore.sendMessage(EventHub.FREE_MEMORY);
    }

    /**
>>>>>>> 9db3d07b9620b4269ab33f78604a36327e536ce1
     * Clear the resource cache. Note that the cache is per-application, so
     * this will clear the cache for all WebViews used.
     *
Solution content 
    }

    /**
     * Call this to pause any extra processing associated with this view and
     * its associated DOM/plugins/javascript/etc. For example, if the view is
     * taken offscreen, this could be called to reduce unnecessary CPU and/or
     * network traffic. When the view is again "active", call onResume().
     *
     * Note that this differs from pauseTimers(), which affects all views/DOMs
     * @hide
     */
    public void onPause() {
        if (!mIsPaused) {
            mIsPaused = true;
            mWebViewCore.sendMessage(EventHub.ON_PAUSE);
        }
    }

    /**
     * Call this to balanace a previous call to onPause()
     * @hide
     */
    public void onResume() {
        if (mIsPaused) {
            mIsPaused = false;
            mWebViewCore.sendMessage(EventHub.ON_RESUME);
        }
    }

    /**
     * Returns true if the view is paused, meaning onPause() was called. Calling
     * onResume() sets the paused state back to false.
     * @hide
     */
    public boolean isPaused() {
        return mIsPaused;
    }

    /**
     * Call this to inform the view that memory is low so that it can
     * free any available memory.
     */
    public void freeMemory() {
        mWebViewCore.sendMessage(EventHub.FREE_MEMORY);
    }

    /**
     * Clear the resource cache. Note that the cache is per-application, so
     * this will clear the cache for all WebViews used.
     *
File
WebView.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    private synchronized final void update(String newName, int newState) {
        if (newName != mHeadsetName || newState != mHeadsetState) {
<<<<<<< HEAD
            boolean isUnplug = (newState == 0 && mHeadsetState > 0);
=======
            boolean isUnplug = false;
            if ( (mHeadsetState & BIT_HEADSET) > 0 || (mHeadsetState & BIT_HEADSET_NO_MIC) > 0) {
                if ((newState & BIT_HEADSET) == 0 && (newState & BIT_HEADSET_NO_MIC) == 0)
                    isUnplug = true;
            }
>>>>>>> 9db3d07b9620b4269ab33f78604a36327e536ce1
            mHeadsetName = newName;
            mPrevHeadsetState = mHeadsetState;
            mHeadsetState = newState;
Solution content 
    private synchronized final void update(String newName, int newState) {
        if (newName != mHeadsetName || newState != mHeadsetState) {
            boolean isUnplug = false;
            if ( (mHeadsetState & BIT_HEADSET) > 0 || (mHeadsetState & BIT_HEADSET_NO_MIC) > 0) {
                if ((newState & BIT_HEADSET) == 0 && (newState & BIT_HEADSET_NO_MIC) == 0)
                    isUnplug = true;
            }
            mHeadsetName = newName;
            mPrevHeadsetState = mHeadsetState;
            mHeadsetState = newState;
File
HeadsetObserver.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Variable
Chunk
Conflicting content 
        // TODO: Should we require a permission?
        ActivityManagerNative.broadcastStickyIntent(intent, null);
<<<<<<< HEAD

        if (isUnplug) {
            intent = new Intent(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
            mContext.sendBroadcast(intent);
        }
    }

    private synchronized final void updateAudioRoute() {
        if (mAudioRouteNeedsUpdate) {
            mAudioManager.setWiredHeadsetOn(mHeadsetState > 0);
            mAudioRouteNeedsUpdate = false;
        }
=======
>>>>>>> 9db3d07b9620b4269ab33f78604a36327e536ce1
    }

    private final Handler mHandler = new Handler() {
Solution content 
        // TODO: Should we require a permission?
        ActivityManagerNative.broadcastStickyIntent(intent, null);
    }

    private final Handler mHandler = new Handler() {
File
HeadsetObserver.java
Developer's decision
Version 2
Kind of conflict
If statement
Method signature