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

Commit 27bf33e0 authored by Josh Hou's avatar Josh Hou Committed by Gerrit Code Review
Browse files

Merge changes Ibec13fbe,If89c67c0 

* changes:
  Fix ViLTE is not available when WiFi Calling is disabled
  Check the missing useHomeWfMode case
parents 49358c53 e2cdd741

res/xml/mobile_network_settings_v2.xml

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ 


        <PreferenceCategory

            android:key="calling_category"

            android:title="@string/call_category">

            android:title="@string/call_category"

            settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController">



            <PreferenceScreen

                android:key="wifi_calling_key"

src/com/android/settings/network/telephony/CallingPreferenceCategoryController.java

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.network.telephony;



import android.content.Context;



import com.android.settings.widget.PreferenceCategoryController;



/**

 * Preference controller for "Calling" category

 */

public class CallingPreferenceCategoryController extends PreferenceCategoryController {



    public CallingPreferenceCategoryController(Context context, String key) {

        super(context, key);

    }

}

src/com/android/settings/network/telephony/MobileNetworkSettings.java

+4 −1
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { 
        if (!FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {

            use(EuiccPreferenceController.class).init(mSubId);

        }

        final WifiCallingPreferenceController wifiCallingPreferenceController =

                use(WifiCallingPreferenceController.class).init(mSubId);



        final OpenNetworkSelectPagePreferenceController openNetworkSelectPagePreferenceController =
@@ -173,6 +174,8 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { 


        final VideoCallingPreferenceController videoCallingPreferenceController =

                use(VideoCallingPreferenceController.class).init(mSubId);

        use(CallingPreferenceCategoryController.class).setChildren(

                Arrays.asList(wifiCallingPreferenceController, videoCallingPreferenceController));

        use(Enhanced4gLtePreferenceController.class).init(mSubId)

                .addListener(videoCallingPreferenceController);

    }

src/com/android/settings/network/telephony/VideoCallingPreferenceController.java

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC 
    @Override

    public int getAvailabilityStatus(int subId) {

        return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID

                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId)

                && isVideoCallEnabled(subId)

                ? AVAILABLE

                : CONDITIONALLY_UNAVAILABLE;

src/com/android/settings/network/telephony/WifiCallingPreferenceController.java

+3 −11
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ import java.util.List; 
public class WifiCallingPreferenceController extends TelephonyBasePreferenceController implements

        LifecycleObserver, OnStart, OnStop {



    @VisibleForTesting

    static final String KEY_PREFERENCE_CATEGORY = "calling_category";



    private TelephonyManager mTelephonyManager;

    @VisibleForTesting

    CarrierConfigManager mCarrierConfigManager;
@@ -95,13 +92,6 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont 
        if (intent != null) {

            intent.putExtra(Settings.EXTRA_SUB_ID, mSubId);

        }

        if (!isAvailable()) {

            // Set category as invisible

            final Preference preferenceCateogry = screen.findPreference(KEY_PREFERENCE_CATEGORY);

            if (preferenceCateogry != null) {

                preferenceCateogry.setVisible(false);

            }

        }

    }



    @Override
@@ -158,12 +148,14 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont 
                mTelephonyManager.getCallState(mSubId) == TelephonyManager.CALL_STATE_IDLE);

    }



    public void init(int subId) {

    public WifiCallingPreferenceController init(int subId) {

        mSubId = subId;

        mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);

        mImsManager = ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(mSubId));

        mSimCallManager = mContext.getSystemService(TelecomManager.class)

                .getSimCallManagerForSubscription(mSubId);



        return this;

    }



    private class PhoneCallStateListener extends PhoneStateListener {