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

Merge "Fix potential NPE in DevelopmentSettingsDashboardFragment" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-01-22 20:00:37 -08:00
committed by Android (Google) Code Review
parent 38b843f8ff f29c38b7c5
commit a9c090df87
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -198,8 +198,12 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
@Override @Override
public void onChange(boolean selfChange, Uri uri) { public void onChange(boolean selfChange, Uri uri) {
super.onChange(selfChange, uri); super.onChange(selfChange, uri);
Activity activity = getActivity();
if (activity == null) {
return;
}
final boolean developmentEnabledState = final boolean developmentEnabledState =
DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext()); DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(activity);
final boolean switchState = mSwitchBar.isChecked(); final boolean switchState = mSwitchBar.isChecked();
// when developer options is enabled, but it is disabled by other privilege apps like: // when developer options is enabled, but it is disabled by other privilege apps like:
@@ -209,7 +213,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
return; return;
} }
disableDeveloperOptions(); disableDeveloperOptions();
getActivity().runOnUiThread(() -> finishFragment()); activity.runOnUiThread(() -> finishFragment());
} }
} }
}; };