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

Merge "Fix typo in WifiCallingSettingsForSub" am: 8959f0698a am: 9fd4f504e2

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

Change-Id: I2de6c43683b2bb0b6473e3623415237f046408bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-25 07:43:25 +00:00
committed by Automerger Merge Worker
parent 70278a9c98 9fd4f504e2
commit ed7625f667
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
View File

@@ -85,8 +85,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
protected static final String FRAGMENT_BUNDLE_SUBID = "subId";
public static final int LAUCH_APP_ACTIVATE = 0;
public static final int LAUCH_APP_UPDATE = 1;
public static final int LAUNCH_APP_ACTIVATE = 0;
public static final int LAUNCH_APP_UPDATE = 1;
//UI objects
private SettingsMainSwitchPreference mSwitchBar;
@@ -179,7 +179,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
preference -> {
final Intent carrierAppIntent = getCarrierActivityIntent();
if (carrierAppIntent != null) {
carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_UPDATE);
carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUNCH_APP_UPDATE);
startActivity(carrierAppIntent);
}
return true;
@@ -493,7 +493,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
* Return null when no activity found.
*/
private Intent getCarrierActivityIntent() {
// Retrive component name from carrier config
// Retrieve component name from carrier config
final CarrierConfigManager configManager =
getActivity().getSystemService(CarrierConfigManager.class);
if (configManager == null) return null;
@@ -549,7 +549,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
// Call address management activity before turning on WFC
final Intent carrierAppIntent = getCarrierActivityIntent();
if (carrierAppIntent != null) {
carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUCH_APP_ACTIVATE);
carrierAppIntent.putExtra(EXTRA_LAUNCH_CARRIER_APP, LAUNCH_APP_ACTIVATE);
startActivityForResult(carrierAppIntent,
REQUEST_CHECK_WFC_EMERGENCY_ADDRESS);
} else {