Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f783a50 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

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

Test: this fixes merge conflict that I skipped
Change-Id: Ie829182b01d01e5ae648165f30cfad7647a97db6
Merged-In: Ie829182b01d01e5ae648165f30cfad7647a97db5
parent f9b00795

system/binder/android/bluetooth/IBluetoothA2dp.aidl

+3 −0
Original line number Diff line number Diff line
@@ -42,4 +42,7 @@ interface IBluetoothA2dp { 
    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);

}

system/binder/android/bluetooth/IBluetoothGatt.aidl

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.bluetooth;



import android.app.PendingIntent;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothGattService;

import android.bluetooth.le.AdvertiseSettings;
@@ -46,6 +47,9 @@ interface IBluetoothGatt { 
    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);

system/binder/android/bluetooth/IBluetoothHeadset.aidl

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ interface IBluetoothHeadset { 
    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();

system/binder/android/bluetooth/IBluetoothManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -50,3 +50,4 @@ interface IBluetoothManager 
    int updateBleAppCount(IBinder b, boolean enable, String packageName);

    boolean isBleAppPresent();

}

system/binder/android/bluetooth/IBluetoothProfileServiceConnection.aidl

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.os.IBinder; 
 *

 * {@hide}

 */

interface IBluetoothProfileServiceConnection {

oneway interface IBluetoothProfileServiceConnection {

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

    void onServiceDisconnected(in ComponentName comp);

}