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

Commit 770996d5 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Fix build break." into pi-dev-plus-aosp

parents c5d21dd4 0287f695

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

+2 −1
Original line number Diff line number Diff line
@@ -41,11 +41,12 @@ import android.os.ParcelUuid; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings.Secure;

import android.support.annotation.VisibleForTesting;

import android.util.Log;

import android.util.Pair;

import android.util.StatsLog;



import androidx.annotation.VisibleForTesting;



import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.RemoteDevices.DeviceProperties;

android/app/src/com/android/bluetooth/hid/HidHostService.java

+2 −1
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ import android.os.Handler; 
import android.os.Message;

import android.os.UserHandle;

import android.provider.Settings;

import android.support.annotation.VisibleForTesting;

import android.util.Log;



import androidx.annotation.VisibleForTesting;



import com.android.bluetooth.BluetoothMetricsProto;

import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.AdapterService;