| Chunk |
|---|
| Conflicting content |
|---|
/* Tracks the power mode for restoration after a DHCP request/renewal goes through */
private int mPowerMode = POWER_MODE_AUTO;
<<<<<<< HEAD
/**
* Default framework scan interval in milliseconds. This is used in the scenario in which
* wifi chipset does not support background scanning to set up a
* periodic wake up scan so that the device can connect to a new access
* point on the move. {@link Settings.Secure#WIFI_FRAMEWORK_SCAN_INTERVAL_MS} can
* override this.
*/
private final int mDefaultFrameworkScanIntervalMs;
=======
>>>>>>> 5389c80d1f7c9d2710a47ccf70cce94c2d5d9599
/**
* Default supplicant scan interval in milliseconds. |
| Solution content |
|---|
/* Tracks the power mode for restoration after a DHCP request/renewal goes through */
private int mPowerMode = POWER_MODE_AUTO;
/**
* Default framework scan interval in milliseconds. This is used in the scenario in which
* wifi chipset does not support background scanning to set up a
* periodic wake up scan so that the device can connect to a new access
* point on the move. {@link Settings.Secure#WIFI_FRAMEWORK_SCAN_INTERVAL_MS} can
* override this.
*/
private final int mDefaultFrameworkScanIntervalMs;
/**
* Default supplicant scan interval in milliseconds. |
| File |
|---|
| WifiStateMachine.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
/*
* stop DHCP
*/
<<<<<<< HEAD
=======
NetworkUtils.resetConnections(mInterfaceName);
>>>>>>> 5389c80d1f7c9d2710a47ccf70cce94c2d5d9599
if (mDhcpStateMachine != null) {
mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_STOP_DHCP);
mDhcpStateMachine.quit(); |
| Solution content |
|---|
/*
* stop DHCP
*/
if (mDhcpStateMachine != null) {
mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_STOP_DHCP);
mDhcpStateMachine.quit(); |
| File |
|---|
| WifiStateMachine.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
if (!linkProperties.equals(mLinkProperties)) {
Log.d(TAG, "Link configuration changed for netId: " + mLastNetworkId
+ " old: " + mLinkProperties + "new: " + linkProperties);
<<<<<<< HEAD
=======
NetworkUtils.resetConnections(mInterfaceName);
>>>>>>> 5389c80d1f7c9d2710a47ccf70cce94c2d5d9599
mLinkProperties = linkProperties;
sendLinkConfigurationChangedBroadcast();
} |
| Solution content |
|---|
if (!linkProperties.equals(mLinkProperties)) {
Log.d(TAG, "Link configuration changed for netId: " + mLastNetworkId
+ " old: " + mLinkProperties + "new: " + linkProperties);
mLinkProperties = linkProperties;
sendLinkConfigurationChangedBroadcast();
} |
| File |
|---|
| WifiStateMachine.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |