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

Commit f08eadc8 authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "BluetoothHealth: hide auto-created default constructors" am: 46345443 

am: 39a6d731

Change-Id: If1410685d139f44a87648bfdb87094cd30ec8462
parents e58f122e 39a6d731

api/current.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -8351,7 +8351,6 @@ package android.bluetooth { 
  }

  }

















  @Deprecated public final class BluetoothHealth implements android.bluetooth.BluetoothProfile {







  @Deprecated public final class BluetoothHealth implements android.bluetooth.BluetoothProfile {











    ctor @Deprecated public BluetoothHealth();














    method @Deprecated public boolean connectChannelToSource(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration);







    method @Deprecated public boolean connectChannelToSource(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration);











    method @Deprecated public boolean disconnectChannel(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration, int);







    method @Deprecated public boolean disconnectChannel(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration, int);











    method @Deprecated public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();







    method @Deprecated public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();









@@ -8375,7 +8374,6 @@ package android.bluetooth {









  }







  }



























  @Deprecated public final class BluetoothHealthAppConfiguration implements android.os.Parcelable {







  @Deprecated public final class BluetoothHealthAppConfiguration implements android.os.Parcelable {











    ctor @Deprecated public BluetoothHealthAppConfiguration();














    method @Deprecated public int describeContents();







    method @Deprecated public int describeContents();











    method @Deprecated public int getDataType();







    method @Deprecated public int getDataType();











    method @Deprecated public String getName();







    method @Deprecated public String getName();

























core/java/android/bluetooth/BluetoothHealth.java



+5
−0




























Original line number
Original line
Diff line number
Diff line








@@ -99,6 +99,11 @@ public final class BluetoothHealth implements BluetoothProfile {









    @Deprecated







    @Deprecated











    public static final int CHANNEL_TYPE_STREAMING = 11;







    public static final int CHANNEL_TYPE_STREAMING = 11;


































    /**














     * Hide auto-created default constructor














     * @hide














     */














    BluetoothHealth() {}































    /**







    /**











     * Register an application configuration that acts as a Health SINK.







     * Register an application configuration that acts as a Health SINK.

































core/java/android/bluetooth/BluetoothHealthAppConfiguration.java



+7
−0




























Original line number
Original line
Diff line number
Diff line








@@ -33,6 +33,13 @@ import android.os.Parcelable;









 */







 */











@Deprecated







@Deprecated











public final class BluetoothHealthAppConfiguration implements Parcelable {







public final class BluetoothHealthAppConfiguration implements Parcelable {





























    /**














     * Hide auto-created default constructor














     * @hide














     */














    BluetoothHealthAppConfiguration() {}


























    @Override







    @Override











    public int describeContents() {







    public int describeContents() {











        return 0;







        return 0;