resolve merge conflicts of 3b10c39a to stage-aosp-master

    oneway void setCodecConfigPreference(in BluetoothCodecConfig codecConfig);

    oneway void enableOptionalCodecs();

    oneway void disableOptionalCodecs();

    int supportsOptionalCodecs(in BluetoothDevice device);

    int getOptionalCodecsEnabled(in BluetoothDevice device);

    oneway void setOptionalCodecsEnabled(in BluetoothDevice device, int value);

}

package android.bluetooth;

import android.app.PendingIntent;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothGattService;

import android.bluetooth.le.AdvertiseSettings;

    void unregisterScanner(in int scannerId);

    void startScan(in int scannerId, in ScanSettings settings, in List<ScanFilter> filters,

                   in List scanStorages, in String callingPackage);

    void startScanForIntent(in PendingIntent intent, in ScanSettings settings, in List<ScanFilter> filters,

                            in String callingPackage);

    void stopScanForIntent(in PendingIntent intent, in String callingPackage);

    void stopScan(in int scannerId);

    void flushPendingBatchResults(in int scannerId);

    void setForceScoAudio(boolean forced);

    boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device);

    boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device);

    void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type);

    oneway void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type);

    void clccResponse(int index, int direction, int status, int mode, boolean mpty,

                      String number, int type);

    boolean enableWBS();

    int updateBleAppCount(IBinder b, boolean enable, String packageName);

    boolean isBleAppPresent();

}

 *

 * {@hide}

 */

interface IBluetoothProfileServiceConnection {

oneway interface IBluetoothProfileServiceConnection {

    void onServiceConnected(in ComponentName comp, in IBinder service);

    void onServiceDisconnected(in ComponentName comp);

}