Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev (7a237a40) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,10 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		* Force to update the list of bluetooth devices
		*/
		public void forceUpdate() {
		if (mLocalManager == null) {
		Log.e(TAG, "forceUpdate() Bluetooth is not supported on this device");
		return;
		}
		if (BluetoothAdapter.getDefaultAdapter().isEnabled()) {
		final Collection<CachedBluetoothDevice> cachedDevices =
		mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
		@@ -121,6 +125,10 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		}

		public void removeAllDevicesFromPreference() {
		if (mLocalManager == null) {
		Log.e(TAG, "removeAllDevicesFromPreference() BT is not supported on this device");
		return;
		}
		final Collection<CachedBluetoothDevice> cachedDevices =
		mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
		for (CachedBluetoothDevice cachedBluetoothDevice : cachedDevices) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -83,9 +83,11 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		if (isAvailable()) {

		mPreferenceGroup = screen.findPreference(KEY);
		mPreferenceGroup.setVisible(false);

		if (isAvailable()) {
		updateTitle();
		mBluetoothDeviceUpdater.setPrefContext(screen.getContext());
		mBluetoothDeviceUpdater.forceUpdate();

+9 −4

Original line number	Diff line number	Diff line
		@@ -73,10 +73,11 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		if (isAvailable()) {

		mPreferenceGroup = screen.findPreference(KEY);
		mPreferenceGroup.setVisible(false);

		if (isAvailable()) {
		final Context context = screen.getContext();
		mBluetoothDeviceUpdater.setPrefContext(context);
		mBluetoothDeviceUpdater.forceUpdate();
		@@ -88,7 +89,11 @@ public class ConnectedDeviceGroupController extends BasePreferenceController

		@Override
		public int getAvailabilityStatus() {
		return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		final PackageManager packageManager = mContext.getPackageManager();
		return (packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		\|\| packageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)
		\|\| packageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)
		\|\| mConnectedDockUpdater != null)
		? AVAILABLE_UNSEARCHABLE
		: UNSUPPORTED_ON_DEVICE;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc

		@Override
		public int getAvailabilityStatus() {
		return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		return (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		\|\| mSavedDockUpdater != null)
		? AVAILABLE
		: CONDITIONALLY_UNAVAILABLE;
		}

+5 −4

Original line number	Diff line number	Diff line
		@@ -73,10 +73,10 @@ public class SavedDeviceGroupController extends BasePreferenceController

		@Override
		public void displayPreference(PreferenceScreen screen) {
		if (isAvailable()) {
		mPreferenceGroup = screen.findPreference(KEY);
		mPreferenceGroup.setVisible(false);

		if (isAvailable()) {
		final Context context = screen.getContext();
		mBluetoothDeviceUpdater.setPrefContext(context);
		mBluetoothDeviceUpdater.forceUpdate();
		@@ -87,7 +87,8 @@ public class SavedDeviceGroupController extends BasePreferenceController

		@Override
		public int getAvailabilityStatus() {
		return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		return (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
		\|\| mSavedDockUpdater != null)
		? AVAILABLE
		: UNSUPPORTED_ON_DEVICE;
		}