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

Commit caf10d19 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Removed "default" for onBluetoothActivityEnergyInfoError" am: ae099dc6 am: a83745e9 

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



Change-Id: I54e5f79aab7e9dad8adc351bc4d8cf68dc49970e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bd612d1 a83745e9

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ package android.bluetooth { 


  public static interface BluetoothAdapter.OnBluetoothActivityEnergyInfoCallback {

    method public void onBluetoothActivityEnergyInfoAvailable(@NonNull android.bluetooth.BluetoothActivityEnergyInfo);

    method public default void onBluetoothActivityEnergyInfoError(int);

    method public void onBluetoothActivityEnergyInfoError(int);

  }



  public static interface BluetoothAdapter.OnMetadataChangedListener {

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -854,8 +854,8 @@ public final class BluetoothAdapter { 
         *

         * @param error code indicating the reason for the failure

         */

        default void onBluetoothActivityEnergyInfoError(

                @BluetoothActivityEnergyInfoCallbackError int error) {}

        void onBluetoothActivityEnergyInfoError(

                @BluetoothActivityEnergyInfoCallbackError int error);

    }



    private static class OnBluetoothActivityEnergyInfoProxy