| Chunk |
|---|
| Conflicting content |
|---|
}
private String mManageMobilePlanMessage;
<<<<<<< HEAD
private static final String CONNECTED_TO_PROVISIONING_NETWORK_ACTION
= "com.android.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK_ACTION";
=======
private static final String MOBILE_PROVISIONING_ACTION
= "com.android.server.connectivityservice.MOBILE_PROVISIONING_ACTION";
>>>>>>> d2f75b8fe896b706893295900f48105990f1cb9d
public void onManageMobilePlanClick() {
log("onManageMobilePlanClick:");
mManageMobilePlanMessage = null; |
| Solution content |
|---|
}
private String mManageMobilePlanMessage;
private static final String CONNECTED_TO_PROVISIONING_NETWORK_ACTION
= "com.android.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK_ACTION";
public void onManageMobilePlanClick() {
log("onManageMobilePlanClick:");
mManageMobilePlanMessage = null; |
| File |
|---|
| WirelessSettings.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
// Get provisioning URL
String url = mCm.getMobileProvisioningUrl();
if (!TextUtils.isEmpty(url)) {
<<<<<<< HEAD
Intent intent = new Intent(CONNECTED_TO_PROVISIONING_NETWORK_ACTION);
=======
Intent intent = new Intent(MOBILE_PROVISIONING_ACTION);
>>>>>>> d2f75b8fe896b706893295900f48105990f1cb9d
intent.putExtra("EXTRA_URL", url);
Context context = getActivity().getBaseContext();
context.sendBroadcast(intent); |
| Solution content |
|---|
// Get provisioning URL
String url = mCm.getMobileProvisioningUrl();
if (!TextUtils.isEmpty(url)) {
Intent intent = new Intent(CONNECTED_TO_PROVISIONING_NETWORK_ACTION);
intent.putExtra("EXTRA_URL", url);
Context context = getActivity().getBaseContext();
context.sendBroadcast(intent); |
| File |
|---|
| WirelessSettings.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |