Projects >> frameworks_base_disabled >>868b0d3b37b3b6b49f3291751e46b1944f1eb0cf

Chunk
Conflicting content 
    public static final int TYPE_WIMAX       = 6;

    /**
<<<<<<< HEAD
     * Bluetooth data connection. This is used for Bluetooth reverse tethering.
     * @hide
     */
    public static final int TYPE_BLUETOOTH   = 7;

    /** {@hide} */
    public static final int TYPE_DUMMY       = 8;
=======
     * Ethernet data connection
     * @hide
     */
    public static final int TYPE_ETHERNET   = 8;

    /** {@hide} */
    public static final int TYPE_DUMMY       = 9;
>>>>>>> bff513725736a58e7411fb6c6597ef962811b7ef
    /** {@hide} TODO: Need to adjust this for WiMAX. */
    public static final int MAX_RADIO_TYPE   = TYPE_DUMMY;
    /** {@hide} TODO: Need to adjust this for WiMAX. */
Solution content 
    public static final int TYPE_WIMAX       = 6;

    /**
     * Bluetooth data connection. This is used for Bluetooth reverse tethering.
     * @hide
     */
    public static final int TYPE_BLUETOOTH   = 7;

    /** {@hide} */
    public static final int TYPE_DUMMY       = 8;
    /** {@hide} TODO: Need to adjust this for WiMAX. */
    public static final int MAX_RADIO_TYPE   = TYPE_DUMMY;
    /** {@hide} TODO: Need to adjust this for WiMAX. */
File
ConnectivityManager.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
package com.android.server;

<<<<<<< HEAD
import android.bluetooth.BluetoothTetheringDataTracker;
=======
import android.app.Notification;
import android.app.NotificationManager;
import android.net.EthernetDataTracker;
>>>>>>> bff513725736a58e7411fb6c6597ef962811b7ef
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
Solution content 
package com.android.server;

import android.bluetooth.BluetoothTetheringDataTracker;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
File
ConnectivityService.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                        mNetAttributes[netType].mName);
                mNetTrackers[netType].startMonitoring(context, mHandler);
                break;
<<<<<<< HEAD
            case ConnectivityManager.TYPE_BLUETOOTH:
                mNetTrackers[netType] = BluetoothTetheringDataTracker.getInstance();
=======
            case ConnectivityManager.TYPE_ETHERNET:
                mNetTrackers[netType] = EthernetDataTracker.getInstance();
>>>>>>> bff513725736a58e7411fb6c6597ef962811b7ef
                mNetTrackers[netType].startMonitoring(context, mHandler);
                break;
            default:
Solution content 
                        mNetAttributes[netType].mName);
                mNetTrackers[netType].startMonitoring(context, mHandler);
                break;
            case ConnectivityManager.TYPE_BLUETOOTH:
                mNetTrackers[netType] = BluetoothTetheringDataTracker.getInstance();
                mNetTrackers[netType].startMonitoring(context, mHandler);
                break;
            default:
File
ConnectivityService.java
Developer's decision
Version 1
Kind of conflict
Array access
Case statement
Method invocation