Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed7625f6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix typo in WifiCallingSettingsForSub" am: 8959f069 am: 9fd4f504 

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



Change-Id: I2de6c43683b2bb0b6473e3623415237f046408bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70278a9c 9fd4f504

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

+5 −5
Original line number Diff line number Diff line
@@ -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 {