Merge "Modify AddDevicePreferenceController's constructor" into pi-dev (11174d3c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/connecteddevice/AddDevicePreferenceController.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -37,8 +37,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
		public class AddDevicePreferenceController extends BasePreferenceController
		implements LifecycleObserver, OnStart, OnStop {

		private static final String KEY = "add_bt_devices";

		private Preference mPreference;
		private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override
		@@ -49,8 +47,8 @@ public class AddDevicePreferenceController extends BasePreferenceController
		private IntentFilter mIntentFilter;
		private BluetoothAdapter mBluetoothAdapter;

		public AddDevicePreferenceController(Context context) {
		super(context, KEY);
		public AddDevicePreferenceController(Context context, String key) {
		super(context, key);
		mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
		mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
		}
		@@ -80,11 +78,6 @@ public class AddDevicePreferenceController extends BasePreferenceController
		: DISABLED_UNSUPPORTED;
		}

		@Override
		public String getPreferenceKey() {
		return KEY;
		}

		@Override
		public CharSequence getSummary() {
		return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()

+2 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,8 @@ public class AddDevicePreferenceControllerTest {
		mContext.getPackageManager());
		mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);

		mAddDevicePreferenceController = new AddDevicePreferenceController(mContext);
		mAddDevicePreferenceController = new AddDevicePreferenceController(mContext,
		"add_bt_devices");
		ReflectionHelpers.setField(mAddDevicePreferenceController,
		"mBluetoothAdapter", mBluetoothAdapter);