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

Merge "Fix mSubscriptionInfoEntity NullPointerException" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-06-06 09:43:17 +00:00
committed by Android (Google) Code Review
parent c417d19839 f2930aad5d
commit b04e2d4692
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -68,7 +68,6 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.function.Consumer;
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class MobileNetworkSettings extends AbstractMobileNetworkSettings implements public class MobileNetworkSettings extends AbstractMobileNetworkSettings implements
@@ -359,24 +358,18 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
} }
private void onSubscriptionDetailChanged() { private void onSubscriptionDetailChanged() {
if (mSubscriptionInfoEntity != null) { final SubscriptionInfoEntity subscriptionInfoEntity = mSubscriptionInfoEntity;
/** if (subscriptionInfoEntity == null) {
* Update the title when SIM stats got changed return;
*/
final Consumer<Activity> renameTitle = activity -> {
if (activity != null && !activity.isFinishing()) {
if (activity instanceof SettingsActivity) {
((SettingsActivity) activity).setTitle(mSubscriptionInfoEntity.uniqueName);
} }
}
};
ThreadUtils.postOnMainThread(() -> { ThreadUtils.postOnMainThread(() -> {
renameTitle.accept(getActivity()); if (getActivity() instanceof SettingsActivity activity && !activity.isFinishing()) {
// Update the title when SIM stats got changed
activity.setTitle(subscriptionInfoEntity.uniqueName);
}
redrawPreferenceControllers(); redrawPreferenceControllers();
}); });
} }
}
@Override @Override
public void onPause() { public void onPause() {