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

Commit fc35c467 authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix some VisibleForTesting usage problem in Metadata" into main am: 237c0bd6 

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



Change-Id: I167331f215dd513246d2752a323767ea539f93c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e190a039 237c0bd6

android/app/src/com/android/bluetooth/btservice/storage/Metadata.java

+1 −6
Original line number Diff line number Diff line
@@ -28,13 +28,11 @@ import androidx.room.Embedded; 
import androidx.room.Entity;

import androidx.room.PrimaryKey;



import com.android.internal.annotations.VisibleForTesting;



import java.util.ArrayList;

import java.util.List;



@Entity(tableName = "metadata")

@VisibleForTesting



public class Metadata {

    @PrimaryKey @NonNull private String address;
@@ -121,7 +119,6 @@ public class Metadata { 
        }

    }



    @VisibleForTesting

    public String getAddress() {

        return address;

    }
@@ -209,7 +206,6 @@ public class Metadata { 
        }

    }



    @VisibleForTesting

    public int getProfileConnectionPolicy(int profile) {

        switch (profile) {

            case BluetoothProfile.A2DP:
@@ -349,7 +345,6 @@ public class Metadata { 
        }

    }



    @VisibleForTesting

    public byte[] getCustomizedMeta(int key) {

        byte[] value = null;

        switch (key) {