PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8 am: d24f4a3f54 am: 41fc3efd4c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I8f3a0597e938b3d1fd1a3e87a89f95834716c16d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-07 01:51:12 +00:00
committed by Automerger Merge Worker
parent 32c2f9b75f 41fc3efd4c
commit 4b4795676e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
View File

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

6
src/com/android/settings/uwb/UwbPreferenceController.java
View File

@@ -75,8 +75,7 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
}; };
} }
@VisibleForTesting public boolean isUwbSupportedOnDevice() {
boolean isUwbSupportedOnDevice() {
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB); return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB);
} }
@@ -99,6 +98,9 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
@Override @Override
public boolean isChecked() { public boolean isChecked() {
if (!isUwbSupportedOnDevice()) {
return false;
}
int state = mUwbManager.getAdapterState(); int state = mUwbManager.getAdapterState();
return state == STATE_ENABLED_ACTIVE || state == STATE_ENABLED_INACTIVE; return state == STATE_ENABLED_ACTIVE || state == STATE_ENABLED_INACTIVE;
} }