Projects >> android_frameworks_base >>b7ab342016bd622b30e1945b16b24413ae82ac54

Chunk
Conflicting content 
    // true if we started navigation
    private boolean mStarted;

<<<<<<< HEAD:services/java/com/android/server/location/GpsLocationProvider.java
    // true if single shot request is in progress
    private boolean mSingleShot;

    // capabilities of the GPS engine
    private int mEngineCapabilities;

=======
>>>>>>> 75a2ae937f5354a3432d0a2382e98177bd9b80d5:location/java/com/android/internal/location/GpsLocationProvider.java
    // true if XTRA is supported
    private boolean mSupportsXtra;
Solution content 
    // true if we started navigation
    private boolean mStarted;

    // true if single shot request is in progress
    private boolean mSingleShot;

    // capabilities of the GPS engine
    private int mEngineCapabilities;

    // true if XTRA is supported
    private boolean mSupportsXtra;
File
GpsLocationProvider.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
        boolean result = false;

        if ("delete_aiding_data".equals(command)) {
<<<<<<< HEAD:services/java/com/android/server/location/GpsLocationProvider.java
            result = deleteAidingData(extras);
        } else if ("force_time_injection".equals(command)) {
            sendMessage(INJECT_NTP_TIME, 0, null);
            result = true;
        } else if ("force_xtra_injection".equals(command)) {
=======
            return deleteAidingData(extras);
        }
        if ("force_time_injection".equals(command)) {
            mHandler.removeMessages(INJECT_NTP_TIME);
            mHandler.sendMessage(Message.obtain(mHandler, INJECT_NTP_TIME));
            return true;
        }
        if ("force_xtra_injection".equals(command)) {
>>>>>>> 75a2ae937f5354a3432d0a2382e98177bd9b80d5:location/java/com/android/internal/location/GpsLocationProvider.java
            if (mSupportsXtra) {
                xtraDownloadRequest();
                result = true;
Solution content 
        boolean result = false;

        if ("delete_aiding_data".equals(command)) {
            result = deleteAidingData(extras);
        } else if ("force_time_injection".equals(command)) {
            sendMessage(INJECT_NTP_TIME, 0, null);
            result = true;
        } else if ("force_xtra_injection".equals(command)) {
            if (mSupportsXtra) {
                xtraDownloadRequest();
                result = true;
File
GpsLocationProvider.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Variable