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

Merge "Fix test error of SatelliteSettingsPreferenceControllerTest" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-02-17 05:51:07 -08:00
committed by Android (Google) Code Review
parent 6946f8238a 543e446150
commit be9c39f0aa
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,7 +286,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
final SatelliteSettingPreferenceController satelliteSettingPreferenceController = use(
SatelliteSettingPreferenceController.class);
if (satelliteSettingPreferenceController != null) {
satelliteSettingPreferenceController.init(mSubId);
satelliteSettingPreferenceController.initialize(mSubId);
}
use(ApnPreferenceController.class).init(mSubId);

2
src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
View File

@@ -160,7 +160,7 @@ public class SatelliteSettingPreferenceController extends
*
* @param subId subscription ID.
*/
public void init(int subId) {
public void initialize(int subId) {
logd("init(), subId=" + subId);
mSubId = subId;
mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);