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

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

Browse Source 
Change-Id: I9bc040d577318ffdec9ff8bd0634e766d2774b8b
This commit is contained in:
Bonian Chen
2020-04-01 07:16:47 +00:00
committed by Automerger Merge Worker
parent d9a0046fd6 cfbdcaf9f5
commit 98f1a405c6
5 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java
View File

@@ -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() {
final ImsMmTelManager imsMmTelManager =
ImsMmTelManager.createForSubscriptionId(mSubId);
return imsMmTelManager.isAdvancedCallingSettingEnabled();
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;
}
}

14
src/com/android/settings/network/ims/ImsQueryProvisioningStat.java
View File

@@ -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() {
final ProvisioningManager privisionManager =
ProvisioningManager.createForSubscriptionId(mSubId);
return privisionManager.getProvisioningStatusForCapability(mCapability, mTech);
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;
}
}

13
src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java
View File

@@ -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);
return imsMmTelManager.isTtyOverVolteEnabled();
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;
}
}

13
src/com/android/settings/network/ims/ImsQueryVtUserSetting.java
View File

@@ -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);
return imsMmTelManager.isVtSettingEnabled();
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;
}
}

13
src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java
View File

@@ -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);
return imsMmTelManager.isVoWiFiSettingEnabled();
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;
}
}