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

Commit 7dc3db3d authored by William Escande's avatar William Escande Committed by Android (Google) Code Review
Browse files

Merge "BT_MAINLINE - clean BytesMatcher" into stage-aosp-master

parents bf3d45df aa553200

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ android_app { 
        "android.hardware.radio-V1.0-java",

        "mmslib",

        "modules-utils-backgroundthread",

        "modules-utils-bytesmatcher",

    ],



    plugins: [

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import android.os.BatteryStats; 
import android.os.BatteryStatsManager;

import android.os.Binder;

import android.os.Bundle;

import android.os.BytesMatcher;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;
@@ -123,6 +122,7 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.BinderCallsStats;

import com.android.modules.utils.BackgroundThread;

import com.android.modules.utils.BytesMatcher;



import com.google.protobuf.InvalidProtocolBufferException;