diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java index 390faa45d07..502c7d25b9c 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java @@ -61,9 +61,10 @@ public class UsbDefaultFragment extends RadioButtonPickerFragment { long mCurrentFunctions; @VisibleForTesting boolean mIsStartTethering = false; + @VisibleForTesting + Handler mHandler; private UsbConnectionBroadcastReceiver mUsbReceiver; - private Handler mHandler; private boolean mIsConnected = false; @VisibleForTesting diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java index 4348e1b358f..924e2468de6 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java @@ -26,7 +26,9 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; +import android.graphics.drawable.Drawable; import android.media.AudioManager; +import android.util.Pair; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; @@ -62,6 +64,8 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { private CachedBluetoothDevice mCachedBluetoothDevice; @Mock private BluetoothDevice mBluetoothDevice; + @Mock + private Drawable mDrawable; private Context mContext; private AvailableMediaBluetoothDeviceUpdater mBluetoothDeviceUpdater; @@ -83,10 +87,12 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { Utils.getLocalBtManager(mContext).getCachedDeviceManager()); mCachedDevices = new ArrayList<>(); mShadowCachedBluetoothDeviceManager.setCachedDevicesCopy(mCachedDevices); + Pair pairs = new Pair<>(mDrawable, "fake_device"); doReturn(mContext).when(mDashboardFragment).getContext(); when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice); when(mCachedBluetoothDevice.getAddress()).thenReturn(MAC_ADDRESS); + when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs); mBluetoothDeviceUpdater = spy(new AvailableMediaBluetoothDeviceUpdater(mContext, mDashboardFragment, mDevicePreferenceCallback)); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index e0a61fedc87..6afa56c42fe 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -27,6 +27,8 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.Intent; +import android.graphics.drawable.Drawable; +import android.util.Pair; import androidx.preference.Preference; @@ -78,6 +80,8 @@ public class BluetoothDeviceUpdaterTest { private LocalBluetoothManager mLocalManager; @Mock private CachedBluetoothDeviceManager mCachedDeviceManager; + @Mock + private Drawable mDrawable; private Context mContext; private BluetoothDeviceUpdater mBluetoothDeviceUpdater; @@ -89,6 +93,7 @@ public class BluetoothDeviceUpdaterTest { public void setUp() { MockitoAnnotations.initMocks(this); + Pair pairs = new Pair<>(mDrawable, "fake_device"); mContext = RuntimeEnvironment.application; mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter()); mCachedDevices.add(mCachedBluetoothDevice); @@ -99,6 +104,7 @@ public class BluetoothDeviceUpdaterTest { when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices); when(mCachedBluetoothDevice.getAddress()).thenReturn(MAC_ADDRESS); when(mSubBluetoothDevice.getAddress()).thenReturn(SUB_MAC_ADDRESS); + when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs); mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false, BluetoothDevicePreference.SortType.TYPE_DEFAULT); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index 34bb069f6e8..ea841fa35d3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -35,6 +35,8 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.res.Resources; +import android.graphics.drawable.Drawable; +import android.util.Pair; import androidx.preference.PreferenceGroup; @@ -70,6 +72,9 @@ public class BluetoothPairingDetailTest { private PreferenceGroup mPreferenceGroup; @Mock private CachedBluetoothDevice mCachedBluetoothDevice; + @Mock + private Drawable mDrawable; + private BluetoothPairingDetail mFragment; private Context mContext; private BluetoothProgressCategory mAvailableDevicesCategory; @@ -82,11 +87,13 @@ public class BluetoothPairingDetailTest { public void setUp() { MockitoAnnotations.initMocks(this); + Pair pairs = new Pair<>(mDrawable, "fake_device"); mContext = RuntimeEnvironment.application; mFragment = spy(new BluetoothPairingDetail()); doReturn(mContext).when(mFragment).getContext(); doReturn(mResource).when(mFragment).getResources(); when(mCachedBluetoothDevice.getAddress()).thenReturn(TEST_DEVICE_ADDRESS); + when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs); mAvailableDevicesCategory = spy(new BluetoothProgressCategory(mContext)); mFooterPreference = new FooterPreference(mContext); diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java index 13e138cbb70..ea91fed19fc 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -28,7 +28,9 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; +import android.graphics.drawable.Drawable; import android.media.AudioManager; +import android.util.Pair; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; @@ -65,6 +67,8 @@ public class ConnectedBluetoothDeviceUpdaterTest { private CachedBluetoothDevice mCachedBluetoothDevice; @Mock private BluetoothDevice mBluetoothDevice; + @Mock + private Drawable mDrawable; private Context mContext; private ConnectedBluetoothDeviceUpdater mBluetoothDeviceUpdater; @@ -77,6 +81,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { public void setUp() { MockitoAnnotations.initMocks(this); + Pair pairs = new Pair<>(mDrawable, "fake_device"); mContext = RuntimeEnvironment.application; mAudioManager = mContext.getSystemService(AudioManager.class); mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter()); @@ -88,6 +93,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice); when(mCachedBluetoothDevice.getAddress()).thenReturn(MAC_ADDRESS); + when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs); mShadowCachedBluetoothDeviceManager.setCachedDevicesCopy(mCachedDevices); mBluetoothDeviceUpdater = spy(new ConnectedBluetoothDeviceUpdater(mContext, mDashboardFragment, mDevicePreferenceCallback)); diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java index 20cc59deca2..78a7a69a2b8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java @@ -28,6 +28,8 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; +import android.graphics.drawable.Drawable; +import android.util.Pair; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; @@ -69,6 +71,8 @@ public class SavedBluetoothDeviceUpdaterTest { private CachedBluetoothDeviceManager mDeviceManager; @Mock private LocalBluetoothManager mBluetoothManager; + @Mock + private Drawable mDrawable; private Context mContext; private SavedBluetoothDeviceUpdater mBluetoothDeviceUpdater; @@ -78,11 +82,13 @@ public class SavedBluetoothDeviceUpdaterTest { public void setUp() { MockitoAnnotations.initMocks(this); + Pair pairs = new Pair<>(mDrawable, "fake_device"); mContext = RuntimeEnvironment.application; doReturn(mContext).when(mDashboardFragment).getContext(); when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice); when(mCachedBluetoothDevice.getAddress()).thenReturn(MAC_ADDRESS); when(mBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); + when(mCachedBluetoothDevice.getDrawableWithDescription()).thenReturn(pairs); mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mContext, mDashboardFragment, mDevicePreferenceCallback)); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 0e033658afe..3d8c49a8cfb 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -29,6 +29,8 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.pm.PackageManager; +import android.graphics.drawable.Drawable; +import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; @@ -100,6 +102,8 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { private BluetoothDevice mBluetoothDevice4; @Mock private BluetoothDevice mBluetoothDevice5; + @Mock + private Drawable mDrawable; private Context mContext; private PreviouslyConnectedDevicePreferenceController mPreConnectedDeviceController; @@ -109,6 +113,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + Pair pairs = new Pair<>(mDrawable, "fake_device"); mContext = spy(RuntimeEnvironment.application); doReturn(mContext).when(mDashboardFragment).getContext(); doReturn(mPackageManager).when(mContext).getPackageManager(); @@ -120,14 +125,19 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { when(mCachedDevice1.getDevice()).thenReturn(mBluetoothDevice1); when(mCachedDevice1.getAddress()).thenReturn(FAKE_ADDRESS_1); + when(mCachedDevice1.getDrawableWithDescription()).thenReturn(pairs); when(mCachedDevice2.getDevice()).thenReturn(mBluetoothDevice2); when(mCachedDevice2.getAddress()).thenReturn(FAKE_ADDRESS_2); + when(mCachedDevice2.getDrawableWithDescription()).thenReturn(pairs); when(mCachedDevice3.getDevice()).thenReturn(mBluetoothDevice3); when(mCachedDevice3.getAddress()).thenReturn(FAKE_ADDRESS_3); + when(mCachedDevice3.getDrawableWithDescription()).thenReturn(pairs); when(mCachedDevice4.getDevice()).thenReturn(mBluetoothDevice4); when(mCachedDevice4.getAddress()).thenReturn(FAKE_ADDRESS_4); + when(mCachedDevice4.getDrawableWithDescription()).thenReturn(pairs); when(mCachedDevice5.getDevice()).thenReturn(mBluetoothDevice5); when(mCachedDevice5.getAddress()).thenReturn(FAKE_ADDRESS_5); + when(mCachedDevice5.getDrawableWithDescription()).thenReturn(pairs); final List mMostRecentlyConnectedDevices = new ArrayList<>(); mMostRecentlyConnectedDevices.add(mBluetoothDevice1); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java index 77d47312a85..f3e1bcedc7b 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.when; import android.hardware.usb.UsbManager; import android.net.TetheringManager; +import android.os.Handler; import androidx.preference.PreferenceScreen; @@ -53,6 +54,8 @@ public class UsbDefaultFragmentTest { private UsbBackend mUsbBackend; @Mock private TetheringManager mTetheringManager; + @Mock + private Handler mHandler; private UsbDefaultFragment mFragment; @@ -62,6 +65,7 @@ public class UsbDefaultFragmentTest { mFragment = new TestFragment(); mFragment.mUsbBackend = mUsbBackend; mFragment.mTetheringManager = mTetheringManager; + mFragment.mHandler = mHandler; } @Test