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

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

Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9 

Change-Id: I3687e0c1884ea802801c3eb00aafe933428cb817
parents 80036cff cfbdcaf9

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

+10 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.ims;



import android.telephony.ims.ImsMmTelManager;

import android.util.Log;





/**
@@ -24,6 +25,7 @@ import android.telephony.ims.ImsMmTelManager; 
 */

public class ImsQueryEnhanced4gLteModeUserSetting implements ImsQuery {



    private static final String LOG_TAG = "QueryEnhanced4gLteModeUserSetting";

    /**

     * Constructor

     * @param subId subscription id
@@ -40,8 +42,13 @@ public class ImsQueryEnhanced4gLteModeUserSetting implements ImsQuery { 
     * @return result of query

     */

    public boolean query() {

        try {

            final ImsMmTelManager imsMmTelManager =

                    ImsMmTelManager.createForSubscriptionId(mSubId);

            return imsMmTelManager.isAdvancedCallingSettingEnabled();

        } catch (IllegalArgumentException exception) {

            Log.w(LOG_TAG, "fail to get VoLte settings. subId=" + mSubId, exception);

        }

        return false;

    }

}

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

+11 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.network.ims; 
import android.telephony.ims.ProvisioningManager;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.util.Log;





/**
@@ -26,6 +27,8 @@ import android.telephony.ims.stub.ImsRegistrationImplBase; 
 */

public class ImsQueryProvisioningStat implements ImsQuery {



    private static final String LOG_TAG = "QueryPrivisioningStat";



    private volatile int mSubId;

    private volatile int mCapability;

    private volatile int mTech;
@@ -50,8 +53,13 @@ public class ImsQueryProvisioningStat implements ImsQuery { 
     * @return result of query

     */

    public boolean query() {

        try {

            final ProvisioningManager privisionManager =

                    ProvisioningManager.createForSubscriptionId(mSubId);

            return privisionManager.getProvisioningStatusForCapability(mCapability, mTech);

        } catch (IllegalArgumentException exception) {

            Log.w(LOG_TAG, "fail to get Provisioning stat. subId=" + mSubId, exception);

        }

        return false;

    }

}

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

+11 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.ims;



import android.telephony.ims.ImsMmTelManager;

import android.util.Log;





/**
@@ -24,6 +25,8 @@ import android.telephony.ims.ImsMmTelManager; 
 */

public class ImsQueryTtyOnVolteStat implements ImsQuery {



    private static final String LOG_TAG = "QueryTtyOnVolteStat";



    /**

     * Constructor

     * @param subId subscription id
@@ -40,7 +43,13 @@ public class ImsQueryTtyOnVolteStat implements ImsQuery { 
     * @return result of query

     */

    public boolean query() {

        final ImsMmTelManager imsMmTelManager = ImsMmTelManager.createForSubscriptionId(mSubId);

        try {

            final ImsMmTelManager imsMmTelManager =

                    ImsMmTelManager.createForSubscriptionId(mSubId);

            return imsMmTelManager.isTtyOverVolteEnabled();

        } catch (IllegalArgumentException exception) {

            Log.w(LOG_TAG, "fail to get VoLte Tty Stat. subId=" + mSubId, exception);

        }

        return false;

    }

}

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

+11 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.ims;



import android.telephony.ims.ImsMmTelManager;

import android.util.Log;





/**
@@ -24,6 +25,8 @@ import android.telephony.ims.ImsMmTelManager; 
 */

public class ImsQueryVtUserSetting implements ImsQuery {



    private static final String LOG_TAG = "QueryVtUserSetting";



    /**

     * Constructor

     * @param subId subscription id
@@ -40,7 +43,13 @@ public class ImsQueryVtUserSetting implements ImsQuery { 
     * @return result of query

     */

    public boolean query() {

        final ImsMmTelManager imsMmTelManager = ImsMmTelManager.createForSubscriptionId(mSubId);

        try {

            final ImsMmTelManager imsMmTelManager =

                    ImsMmTelManager.createForSubscriptionId(mSubId);

            return imsMmTelManager.isVtSettingEnabled();

        } catch (IllegalArgumentException exception) {

            Log.w(LOG_TAG, "fail to get VT settings. subId=" + mSubId, exception);

        }

        return false;

    }

}

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

+11 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.ims;



import android.telephony.ims.ImsMmTelManager;

import android.util.Log;





/**
@@ -24,6 +25,8 @@ import android.telephony.ims.ImsMmTelManager; 
 */

public class ImsQueryWfcUserSetting implements ImsQuery {



    private static final String LOG_TAG = "QueryWfcUserSetting";



    /**

     * Constructor

     * @param subId subscription id
@@ -40,7 +43,13 @@ public class ImsQueryWfcUserSetting implements ImsQuery { 
     * @return result of query

     */

    public boolean query() {

        final ImsMmTelManager imsMmTelManager = ImsMmTelManager.createForSubscriptionId(mSubId);

        try {

            final ImsMmTelManager imsMmTelManager =

                    ImsMmTelManager.createForSubscriptionId(mSubId);

            return imsMmTelManager.isVoWiFiSettingEnabled();

        } catch (IllegalArgumentException exception) {

            Log.w(LOG_TAG, "fail to get Wfc settings. subId=" + mSubId, exception);

        }

        return false;

    }

}