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

Commit de815fff authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes If3ebadbb,I995e7a60,I283afc0c,I1fe321d6,I3505cd15 into main am: 09d3b019 

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



Change-Id: I6e7eb52a2bb889a598f7336cd426544ef35d7f08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7935861d 09d3b019

PREUPLOAD.cfg

+8 −12
Original line number Diff line number Diff line
@@ -2,27 +2,23 @@ 
ignore_merged_commits = true



[Builtin Hooks]

bpfmt = true

clang_format = true

commit_msg_changeid_field = true

commit_msg_bug_field = true

cpplint = true

google_java_format = true

clang_format = true

rustfmt = true

bpfmt = true

ktfmt = true

rustfmt = true



[Builtin Hooks Options]

rustfmt = --config-path=rustfmt.toml

# Only turn on clang-format check for C and C++ headers and sources

bpfmt = -s

clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp,hpp

google_java_format= --sort-imports

ktfmt = --kotlinlang-style

bpfmt = -s

rustfmt = --config-path=rustfmt.toml



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

                  -fw android/app/src/com/android/bluetooth/

                      android/app/lib/mapapi/com/android/bluetooth/mapapi/

                      android/app/tests/src/com/android/bluetooth/

                      framework/

                      service/

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}

yapf_hook = ./system/tools/scripts/yapf_checker.py

android/ChannelSoundingTestApp/app/src/androidTest/java/com/android/bluetooth/channelsoundingtestapp/ExampleInstrumentedTest.java

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.bluetooth.channelsoundingtestapp; 
import static com.google.common.truth.Truth.assertThat;



import android.content.Context;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;

android/ChannelSoundingTestApp/app/src/main/java/com/android/bluetooth/channelsoundingtestapp/DistanceMeasurementInitiator.java

+2 −0
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ import android.bluetooth.le.DistanceMeasurementResult; 
import android.bluetooth.le.DistanceMeasurementSession;

import android.content.Context;

import android.util.Pair;



import androidx.annotation.Nullable;



import java.util.ArrayList;

import java.util.List;

import java.util.Set;

android/ChannelSoundingTestApp/app/src/main/java/com/android/bluetooth/channelsoundingtestapp/InitiatorFragment.java

+2 −0
Original line number Diff line number Diff line
@@ -29,9 +29,11 @@ import android.widget.Button; 
import android.widget.LinearLayout;

import android.widget.Spinner;

import android.widget.TextView;



import androidx.annotation.NonNull;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.ViewModelProviders;



import java.text.DecimalFormat;

import java.util.ArrayList;

android/ChannelSoundingTestApp/app/src/main/java/com/android/bluetooth/channelsoundingtestapp/InitiatorViewModel.java

+3 −0
Original line number Diff line number Diff line
@@ -17,11 +17,14 @@ 
package com.android.bluetooth.channelsoundingtestapp;



import android.app.Application;



import androidx.annotation.NonNull;

import androidx.lifecycle.AndroidViewModel;

import androidx.lifecycle.LiveData;

import androidx.lifecycle.MutableLiveData;



import com.android.bluetooth.channelsoundingtestapp.DistanceMeasurementInitiator.BtDistanceMeasurementCallback;



import java.util.List;



/** ViewModel for the Initiator. */