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

Commit 722463ff authored by Eugene Susla's avatar Eugene Susla
Browse files

Follow acronym convention for Companion BLE filter 

Test: Ensure no compilation error
Fixes: 37514177
Change-Id: I4c255cf6b3c62d762755a9822928561371ecd88d
parent cd68c334

api/current.txt

+10 −10
Original line number Diff line number Diff line
@@ -8271,21 +8271,21 @@ package android.companion { 
    method public android.companion.BluetoothDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);

  }













  public final class BluetoothLEDeviceFilter implements android.companion.DeviceFilter {













  public final class BluetoothLeDeviceFilter implements android.companion.DeviceFilter {















    method public int describeContents();















    method public static int getRenamePrefixLengthLimit();















    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.companion.BluetoothLEDeviceFilter> CREATOR;













    field public static final android.os.Parcelable.Creator<android.companion.BluetoothLeDeviceFilter> CREATOR;















  }



























  public static final class BluetoothLEDeviceFilter.Builder {













    ctor public BluetoothLEDeviceFilter.Builder();













    method public android.companion.BluetoothLEDeviceFilter build();













    method public android.companion.BluetoothLEDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRawDataFilter(byte[], byte[]);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int);













    method public android.companion.BluetoothLEDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter);













  public static final class BluetoothLeDeviceFilter.Builder {













    ctor public BluetoothLeDeviceFilter.Builder();













    method public android.companion.BluetoothLeDeviceFilter build();













    method public android.companion.BluetoothLeDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRawDataFilter(byte[], byte[]);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int);













    method public android.companion.BluetoothLeDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter);















  }





























  public final class CompanionDeviceManager {

























api/system-current.txt



+10
−10




























Original line number
Diff line number
Diff line








@@ -8768,21 +8768,21 @@ package android.companion {













    method public android.companion.BluetoothDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);















  }



























  public final class BluetoothLEDeviceFilter implements android.companion.DeviceFilter {













  public final class BluetoothLeDeviceFilter implements android.companion.DeviceFilter {















    method public int describeContents();















    method public static int getRenamePrefixLengthLimit();















    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.companion.BluetoothLEDeviceFilter> CREATOR;













    field public static final android.os.Parcelable.Creator<android.companion.BluetoothLeDeviceFilter> CREATOR;















  }



























  public static final class BluetoothLEDeviceFilter.Builder {













    ctor public BluetoothLEDeviceFilter.Builder();













    method public android.companion.BluetoothLEDeviceFilter build();













    method public android.companion.BluetoothLEDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRawDataFilter(byte[], byte[]);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int);













    method public android.companion.BluetoothLEDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter);













  public static final class BluetoothLeDeviceFilter.Builder {













    ctor public BluetoothLeDeviceFilter.Builder();













    method public android.companion.BluetoothLeDeviceFilter build();













    method public android.companion.BluetoothLeDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRawDataFilter(byte[], byte[]);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int);













    method public android.companion.BluetoothLeDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter);















  }





























  public final class CompanionDeviceManager {

























api/test-current.txt



+10
−10




























Original line number
Diff line number
Diff line








@@ -8302,21 +8302,21 @@ package android.companion {













    method public android.companion.BluetoothDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);















  }



























  public final class BluetoothLEDeviceFilter implements android.companion.DeviceFilter {













  public final class BluetoothLeDeviceFilter implements android.companion.DeviceFilter {















    method public int describeContents();















    method public static int getRenamePrefixLengthLimit();















    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.companion.BluetoothLEDeviceFilter> CREATOR;













    field public static final android.os.Parcelable.Creator<android.companion.BluetoothLeDeviceFilter> CREATOR;















  }



























  public static final class BluetoothLEDeviceFilter.Builder {













    ctor public BluetoothLEDeviceFilter.Builder();













    method public android.companion.BluetoothLEDeviceFilter build();













    method public android.companion.BluetoothLEDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRawDataFilter(byte[], byte[]);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean);













    method public android.companion.BluetoothLEDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int);













    method public android.companion.BluetoothLEDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter);













  public static final class BluetoothLeDeviceFilter.Builder {













    ctor public BluetoothLeDeviceFilter.Builder();













    method public android.companion.BluetoothLeDeviceFilter build();













    method public android.companion.BluetoothLeDeviceFilter.Builder setNamePattern(java.util.regex.Pattern);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRawDataFilter(byte[], byte[]);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean);













    method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int);













    method public android.companion.BluetoothLeDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter);















  }





























  public final class CompanionDeviceManager {

























core/java/android/companion/BluetoothLEDeviceFilter.java→core/java/android/companion/BluetoothLeDeviceFilter.java



+13
−13




























Original line number
Diff line number
Diff line








@@ -47,10 +47,10 @@ import java.util.regex.Pattern;













 *















 * @see ScanFilter















 */













public final class BluetoothLEDeviceFilter implements DeviceFilter<ScanResult> {













public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> {































    private static final boolean DEBUG = false;













    private static final String LOG_TAG = "BluetoothLEDeviceFilter";













    private static final String LOG_TAG = "BluetoothLeDeviceFilter";































    private static final int RENAME_PREFIX_LENGTH_LIMIT = 10;

























@@ -66,7 +66,7 @@ public final class BluetoothLEDeviceFilter implements DeviceFilter<ScanResult> {













    private final int mRenameNameTo;















    private final boolean mRenameBytesReverseOrder;





























    private BluetoothLEDeviceFilter(Pattern namePattern, ScanFilter scanFilter,













    private BluetoothLeDeviceFilter(Pattern namePattern, ScanFilter scanFilter,















            byte[] rawDataFilter, byte[] rawDataFilterMask, String renamePrefix,















            String renameSuffix, int renameBytesFrom, int renameBytesTo,















            int renameNameFrom, int renameNameTo, boolean renameBytesReverseOrder) {










@@ -186,7 +186,7 @@ public final class BluetoothLEDeviceFilter implements DeviceFilter<ScanResult> {













    public boolean equals(Object o) {















        if (this == o) return true;















        if (o == null || getClass() != o.getClass()) return false;













        BluetoothLEDeviceFilter that = (BluetoothLEDeviceFilter) o;













        BluetoothLeDeviceFilter that = (BluetoothLeDeviceFilter) o;















        return mRenameBytesFrom == that.mRenameBytesFrom &&















                mRenameBytesTo == that.mRenameBytesTo &&















                mRenameBytesReverseOrder == that.mRenameBytesReverseOrder &&










@@ -242,10 +242,10 @@ public final class BluetoothLEDeviceFilter implements DeviceFilter<ScanResult> {













                '}';















    }





























    public static final Creator<BluetoothLEDeviceFilter> CREATOR













            = new Creator<BluetoothLEDeviceFilter>() {













    public static final Creator<BluetoothLeDeviceFilter> CREATOR













            = new Creator<BluetoothLeDeviceFilter>() {















        @Override













        public BluetoothLEDeviceFilter createFromParcel(Parcel in) {













        public BluetoothLeDeviceFilter createFromParcel(Parcel in) {















            Builder builder = new Builder()















                    .setNamePattern(patternFromString(in.readString()))















                    .setScanFilter(in.readParcelable(null));










@@ -273,8 +273,8 @@ public final class BluetoothLEDeviceFilter implements DeviceFilter<ScanResult> {













        }































        @Override













        public BluetoothLEDeviceFilter[] newArray(int size) {













            return new BluetoothLEDeviceFilter[size];













        public BluetoothLeDeviceFilter[] newArray(int size) {













            return new BluetoothLeDeviceFilter[size];















        }















    };

























@@ -283,9 +283,9 @@ public final class BluetoothLEDeviceFilter implements DeviceFilter<ScanResult> {













    }































    /**













     * Builder for {@link BluetoothLEDeviceFilter}













     * Builder for {@link BluetoothLeDeviceFilter}















     */













    public static final class Builder extends OneTimeUseBuilder<BluetoothLEDeviceFilter> {













    public static final class Builder extends OneTimeUseBuilder<BluetoothLeDeviceFilter> {















        private ScanFilter mScanFilter;















        private Pattern mNamePattern;















        private byte[] mRawDataFilter;










@@ -418,9 +418,9 @@ public final class BluetoothLEDeviceFilter implements DeviceFilter<ScanResult> {













        /** @inheritDoc */















        @Override















        @NonNull













        public BluetoothLEDeviceFilter build() {













        public BluetoothLeDeviceFilter build() {















            markUsed();













            return new BluetoothLEDeviceFilter(mNamePattern, mScanFilter,













            return new BluetoothLeDeviceFilter(mNamePattern, mScanFilter,















                    mRawDataFilter, mRawDataFilterMask,















                    mRenamePrefix, mRenameSuffix,















                    mRenameBytesFrom, mRenameBytesTo,

































packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -35,7 +35,7 @@ import android.bluetooth.le.ScanResult;













import android.bluetooth.le.ScanSettings;















import android.companion.AssociationRequest;















import android.companion.BluetoothDeviceFilter;













import android.companion.BluetoothLEDeviceFilter;













import android.companion.BluetoothLeDeviceFilter;















import android.companion.DeviceFilter;















import android.companion.ICompanionDeviceDiscoveryService;















import android.companion.ICompanionDeviceDiscoveryServiceCallback;










@@ -79,7 +79,7 @@ public class DeviceDiscoveryService extends Service {













    private ScanSettings mDefaultScanSettings = new ScanSettings.Builder().build();































    private List<DeviceFilter<?>> mFilters;













    private List<BluetoothLEDeviceFilter> mBLEFilters;













    private List<BluetoothLeDeviceFilter> mBLEFilters;















    private List<BluetoothDeviceFilter> mBluetoothFilters;















    private List<WifiDeviceFilter> mWifiFilters;















    private List<ScanFilter> mBLEScanFilters;










@@ -144,8 +144,8 @@ public class DeviceDiscoveryService extends Service {













            mFilters = request.getDeviceFilters();















            mWifiFilters = CollectionUtils.filter(mFilters, WifiDeviceFilter.class);















            mBluetoothFilters = CollectionUtils.filter(mFilters, BluetoothDeviceFilter.class);













            mBLEFilters = CollectionUtils.filter(mFilters, BluetoothLEDeviceFilter.class);













            mBLEScanFilters = CollectionUtils.map(mBLEFilters, BluetoothLEDeviceFilter::getScanFilter);













            mBLEFilters = CollectionUtils.filter(mFilters, BluetoothLeDeviceFilter.class);













            mBLEScanFilters = CollectionUtils.map(mBLEFilters, BluetoothLeDeviceFilter::getScanFilter);































            reset();















        } else if (DEBUG) Log.i(LOG_TAG, "startDiscovery: duplicate request: " + request);