Projects >> platform_frameworks_base >>8ffeda02d73ec3d39311e03b2a377e1ac9007f6b

Chunk
Conflicting content 
                    = source.autoJoinUseAggressiveJoinAttemptThreshold;
            autoJoinBailedDueToLowRssi = source.autoJoinBailedDueToLowRssi;
            dirty = source.dirty;
<<<<<<< HEAD
            userApproved = source.userApproved;
=======
            numNoInternetAccessReports = source.numNoInternetAccessReports;
>>>>>>> ec3e9805dd7c527f961d1f2a14e5752b461186ca
        }
    }
Solution content 
                    = source.autoJoinUseAggressiveJoinAttemptThreshold;
            autoJoinBailedDueToLowRssi = source.autoJoinBailedDueToLowRssi;
            dirty = source.dirty;
            userApproved = source.userApproved;
            numNoInternetAccessReports = source.numNoInternetAccessReports;
        }
    }
File
WifiConfiguration.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Variable
Chunk
Conflicting content 
        dest.writeInt(numUserTriggeredJoinAttempts);
        dest.writeInt(autoJoinUseAggressiveJoinAttemptThreshold);
        dest.writeInt(autoJoinBailedDueToLowRssi ? 1 : 0);
<<<<<<< HEAD
        dest.writeInt(userApproved);
=======
        dest.writeInt(numNoInternetAccessReports);
>>>>>>> ec3e9805dd7c527f961d1f2a14e5752b461186ca
    }

    /** Implement the Parcelable interface {@hide} */
Solution content 
        dest.writeInt(numUserTriggeredJoinAttempts);
        dest.writeInt(autoJoinUseAggressiveJoinAttemptThreshold);
        dest.writeInt(autoJoinBailedDueToLowRssi ? 1 : 0);
        dest.writeInt(userApproved);
        dest.writeInt(numNoInternetAccessReports);
    }

    /** Implement the Parcelable interface {@hide} */
File
WifiConfiguration.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
                config.numUserTriggeredJoinAttempts = in.readInt();
                config.autoJoinUseAggressiveJoinAttemptThreshold = in.readInt();
                config.autoJoinBailedDueToLowRssi = in.readInt() != 0;
<<<<<<< HEAD
                config.userApproved = in.readInt();
=======
                config.numNoInternetAccessReports = in.readInt();
>>>>>>> ec3e9805dd7c527f961d1f2a14e5752b461186ca
                return config;
            }
Solution content 
                config.numUserTriggeredJoinAttempts = in.readInt();
                config.autoJoinUseAggressiveJoinAttemptThreshold = in.readInt();
                config.autoJoinBailedDueToLowRssi = in.readInt() != 0;
                config.userApproved = in.readInt();
                config.numNoInternetAccessReports = in.readInt();
                return config;
            }
File
WifiConfiguration.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Variable