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

Commit ceb1bc41 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove @NonNull from boolean parameters and init the name with empty... 

Merge "Remove @NonNull from boolean parameters and init the name with empty string" am: 7e305589 am: a45dd140 am: 91b44709

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1981669

Change-Id: Iafd06a483348dbc4035a823cbc590cdfea3e69ec
parents 9102f456 91b44709

framework/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -301,10 +301,10 @@ package android.bluetooth { 
  public static final class BluetoothHapPresetInfo.Builder {

    ctor public BluetoothHapPresetInfo.Builder();

    method @NonNull public android.bluetooth.BluetoothHapPresetInfo build();

    method @NonNull public android.bluetooth.BluetoothHapPresetInfo.Builder setAvailable(@NonNull boolean);

    method @NonNull public android.bluetooth.BluetoothHapPresetInfo.Builder setAvailable(boolean);

    method @NonNull public android.bluetooth.BluetoothHapPresetInfo.Builder setIndex(int);

    method @NonNull public android.bluetooth.BluetoothHapPresetInfo.Builder setName(@NonNull String);

    method @NonNull public android.bluetooth.BluetoothHapPresetInfo.Builder setWritable(@NonNull boolean);

    method @NonNull public android.bluetooth.BluetoothHapPresetInfo.Builder setWritable(boolean);

  }



  public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {

framework/java/android/bluetooth/BluetoothHapPresetInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.os.Parcelable; 
@SystemApi

public final class BluetoothHapPresetInfo implements Parcelable {

    private int mPresetIndex;

    private String mPresetName;

    private String mPresetName = "";

    private boolean mIsWritable;

    private boolean mIsAvailable;
@@ -165,7 +165,7 @@ public final class BluetoothHapPresetInfo implements Parcelable { 
         * @param isWritable whether preset is writable

         * @return the same Builder instance

         */

        public @NonNull Builder setWritable(@NonNull boolean isWritable) {

        public @NonNull Builder setWritable(boolean isWritable) {

            mIsWritable = isWritable;

            return this;

        }
@@ -176,7 +176,7 @@ public final class BluetoothHapPresetInfo implements Parcelable { 
         * @param isAvailable whether preset is currently available to select

         * @return the same Builder instance

         */

        public @NonNull Builder setAvailable(@NonNull boolean isAvailable) {

        public @NonNull Builder setAvailable(boolean isAvailable) {

            mIsAvailable = isAvailable;

            return this;

        }