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

Fix crash due to UserManager is null.

Browse Source 
- Instance of UserManager get from onCraete, so  we can not use this
   onAttach.

Flag: EXEMPT bug fix
Fix: 289232540
Test: Manual test
Change-Id: Ieb62d8289db0dbcd5a16280aa66f3b3de8936e26
This commit is contained in:
tomhsu
2024-08-12 05:24:38 +00:00
committed by Tom Hsu
parent 0373a46e81
commit b213804b87
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,12 +202,6 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
super.onAttach(context); super.onAttach(context);
if (isUiRestricted()) {
Log.d(LOG_TAG, "Mobile network page is disallowed.");
finish();
return;
}
if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
Log.d(LOG_TAG, "Invalid subId, get the default subscription to show."); Log.d(LOG_TAG, "Invalid subId, get the default subscription to show.");
SubscriptionInfo info = SubscriptionUtil.getSubscriptionOrDefault(context, mSubId); SubscriptionInfo info = SubscriptionUtil.getSubscriptionOrDefault(context, mSubId);
@@ -346,6 +340,11 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
setTelephonyAvailabilityStatus(getPreferenceControllersAsList()); setTelephonyAvailabilityStatus(getPreferenceControllersAsList());
super.onCreate(icicle); super.onCreate(icicle);
if (isUiRestricted()) {
Log.d(LOG_TAG, "Mobile network page is disallowed.");
finish();
return;
}
final Context context = getContext(); final Context context = getContext();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mTelephonyManager = context.getSystemService(TelephonyManager.class) mTelephonyManager = context.getSystemService(TelephonyManager.class)