From 82dd3b0bf6716ccee0f82b2b2db234cdefd34ff6 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 27 Dec 2016 13:13:00 -0800 Subject: [PATCH] Make classes non-final so mockito can mock them. Bug: 33341275 Test: RunSettingsRoboTests Change-Id: If83180d7caf3af29c9d0dcdc20d557d8d9827c74 --- .../android/settingslib/bluetooth/BluetoothEventManager.java | 2 +- .../android/settingslib/bluetooth/CachedBluetoothDevice.java | 2 +- .../settingslib/bluetooth/CachedBluetoothDeviceManager.java | 2 +- .../android/settingslib/bluetooth/LocalBluetoothAdapter.java | 2 +- .../android/settingslib/bluetooth/LocalBluetoothManager.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java index a332332131012..80b943c31183b 100755 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java @@ -38,7 +38,7 @@ import java.util.Set; * API and dispatches the event on the UI thread to the right class in the * Settings. */ -public final class BluetoothEventManager { +public class BluetoothEventManager { private static final String TAG = "BluetoothEventManager"; private final LocalBluetoothAdapter mLocalAdapter; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index 52e686c9bce97..e279a09c2bd20 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -42,7 +42,7 @@ import java.util.List; * functionality that can be performed on the device (connect, pair, disconnect, * etc.). */ -public final class CachedBluetoothDevice implements Comparable { +public class CachedBluetoothDevice implements Comparable { private static final String TAG = "CachedBluetoothDevice"; private static final boolean DEBUG = Utils.V; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java index a9f4bd31e42b5..a3ae9269b1f79 100755 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java @@ -28,7 +28,7 @@ import java.util.List; /** * CachedBluetoothDeviceManager manages the set of remote Bluetooth devices. */ -public final class CachedBluetoothDeviceManager { +public class CachedBluetoothDeviceManager { private static final String TAG = "CachedBluetoothDeviceManager"; private static final boolean DEBUG = Utils.D; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java index 26836099c9de5..115c62298d9f1 100755 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java @@ -35,7 +35,7 @@ import java.util.Set; * are handled by {@link CachedBluetoothDeviceManager}, * {@link BluetoothEventManager}, and {@link LocalBluetoothProfileManager}. */ -public final class LocalBluetoothAdapter { +public class LocalBluetoothAdapter { private static final String TAG = "LocalBluetoothAdapter"; /** This class does not allow direct access to the BluetoothAdapter. */ diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java index 623ccc39a8420..1993b459da533 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java @@ -25,7 +25,7 @@ import android.util.Log; * if there is no Bluetooth adapter on this device, and callers must be * prepared to handle this case. */ -public final class LocalBluetoothManager { +public class LocalBluetoothManager { private static final String TAG = "LocalBluetoothManager"; /** Singleton instance. */