Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle... (b2a466d9) · Commits · e / os / android_packages_apps_Settings

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -69,10 +69,14 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
		public void onAttach(Context context) {
		super.onAttach(context);
		UwbPreferenceController uwbPreferenceController = use(UwbPreferenceController.class);
		if (uwbPreferenceController != null && getSettingsLifecycle() != null) {
		// We only need the observer listen to the broadcast in the background for refreshing
		// UI if the device supports UWB.
		if (uwbPreferenceController != null && uwbPreferenceController.isUwbSupportedOnDevice()) {
		if (getSettingsLifecycle() != null) {
		getSettingsLifecycle().addObserver(uwbPreferenceController);
		}
		}
		}

		@Override
		protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -75,8 +75,7 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
		};
		}

		@VisibleForTesting
		boolean isUwbSupportedOnDevice() {
		public boolean isUwbSupportedOnDevice() {
		return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB);
		}

		@@ -99,6 +98,9 @@ public class UwbPreferenceController extends TogglePreferenceController implemen

		@Override
		public boolean isChecked() {
		if (!isUwbSupportedOnDevice()) {
		return false;
		}
		int state = mUwbManager.getAdapterState();
		return state == STATE_ENABLED_ACTIVE \|\| state == STATE_ENABLED_INACTIVE;
		}