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

Commit fc9bdd1f authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into... 

Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb

Change-Id: Ic2c5c2d409176de58ba54dce107b5f94195c4c64
parents ea1c86bf 06899ffb

src/com/android/settings/network/ims/ImsQueryController.java

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ abstract class ImsQueryController { 


    @VisibleForTesting

    boolean isProvisionedOnDevice(int subId) {

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            return false;

        }

        return (new ImsQueryProvisioningStat(subId, mCapability, mTech)).query();

    }

src/com/android/settings/network/ims/VolteQueryImsState.java

+9 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ public class VolteQueryImsState extends ImsQueryController { 
     */

    @VisibleForTesting

    boolean isEnabledByUser(int subId) {

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            return false;

        }

        return (new ImsQueryEnhanced4gLteModeUserSetting(subId)).query();

    }
@@ -75,6 +78,9 @@ public class VolteQueryImsState extends ImsQueryController { 
     * @return true when VoLTE has been enabled, otherwise false

     */

    public boolean isVoLteProvisioned() {

        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {

            return false;

        }

        if (!isProvisionedOnDevice(mSubId)) {

            return false;

        }
@@ -92,6 +98,9 @@ public class VolteQueryImsState extends ImsQueryController { 
     * @return true when VoLTE can be performed, otherwise false

     */

    public boolean isReadyToVoLte() {

        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {

            return false;

        }

        return isVoLteProvisioned()

                && MobileNetworkUtils.isImsServiceStateReady(getImsManager(mSubId));

    }

src/com/android/settings/network/ims/VtQueryImsState.java

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ public class VtQueryImsState extends ImsQueryController { 
     */

    @VisibleForTesting

    boolean isEnabledByUser(int subId) {

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            return false;

        }

        return (new ImsQueryVtUserSetting(subId)).query();

    }

src/com/android/settings/network/ims/WifiCallingQueryImsState.java

+9 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ public class WifiCallingQueryImsState extends ImsQueryController { 
     */

    @VisibleForTesting

    boolean isEnabledByUser(int subId) {

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            return false;

        }

        return (new ImsQueryWfcUserSetting(subId)).query();

    }
@@ -71,6 +74,9 @@ public class WifiCallingQueryImsState extends ImsQueryController { 
     * @return true when Wifi Calling has been enabled, otherwise false

     */

    public boolean isWifiCallingProvisioned() {

        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {

            return false;

        }

        final ImsManager imsManager = getImsManager(mSubId);

        if (imsManager == null) {

            return false;
@@ -86,6 +92,9 @@ public class WifiCallingQueryImsState extends ImsQueryController { 
     * @return true when Wifi Calling can be performed, otherwise false

     */

    public boolean isReadyToWifiCalling() {

        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {

            return false;

        }

        return isWifiCallingProvisioned()

                && MobileNetworkUtils.isImsServiceStateReady(getImsManager(mSubId));

    }