Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
am: 98f1a405c6
Change-Id: Ic20177035e6902b8d55c52baa039f540bdd574ac
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
package com.android.settings.network.ims;
|
package com.android.settings.network.ims;
|
||||||
|
|
||||||
import android.telephony.ims.ImsMmTelManager;
|
import android.telephony.ims.ImsMmTelManager;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -24,6 +25,7 @@ import android.telephony.ims.ImsMmTelManager;
|
|||||||
*/
|
*/
|
||||||
public class ImsQueryEnhanced4gLteModeUserSetting implements ImsQuery {
|
public class ImsQueryEnhanced4gLteModeUserSetting implements ImsQuery {
|
||||||
|
|
||||||
|
private static final String LOG_TAG = "QueryEnhanced4gLteModeUserSetting";
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
* @param subId subscription id
|
* @param subId subscription id
|
||||||
@@ -40,8 +42,13 @@ public class ImsQueryEnhanced4gLteModeUserSetting implements ImsQuery {
|
|||||||
* @return result of query
|
* @return result of query
|
||||||
*/
|
*/
|
||||||
public boolean query() {
|
public boolean query() {
|
||||||
|
try {
|
||||||
final ImsMmTelManager imsMmTelManager =
|
final ImsMmTelManager imsMmTelManager =
|
||||||
ImsMmTelManager.createForSubscriptionId(mSubId);
|
ImsMmTelManager.createForSubscriptionId(mSubId);
|
||||||
return imsMmTelManager.isAdvancedCallingSettingEnabled();
|
return imsMmTelManager.isAdvancedCallingSettingEnabled();
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
Log.w(LOG_TAG, "fail to get VoLte settings. subId=" + mSubId, exception);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -19,6 +19,7 @@ package com.android.settings.network.ims;
|
|||||||
import android.telephony.ims.ProvisioningManager;
|
import android.telephony.ims.ProvisioningManager;
|
||||||
import android.telephony.ims.feature.MmTelFeature;
|
import android.telephony.ims.feature.MmTelFeature;
|
||||||
import android.telephony.ims.stub.ImsRegistrationImplBase;
|
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 {
|
public class ImsQueryProvisioningStat implements ImsQuery {
|
||||||
|
|
||||||
|
private static final String LOG_TAG = "QueryPrivisioningStat";
|
||||||
|
|
||||||
private volatile int mSubId;
|
private volatile int mSubId;
|
||||||
private volatile int mCapability;
|
private volatile int mCapability;
|
||||||
private volatile int mTech;
|
private volatile int mTech;
|
||||||
@@ -50,8 +53,13 @@ public class ImsQueryProvisioningStat implements ImsQuery {
|
|||||||
* @return result of query
|
* @return result of query
|
||||||
*/
|
*/
|
||||||
public boolean query() {
|
public boolean query() {
|
||||||
|
try {
|
||||||
final ProvisioningManager privisionManager =
|
final ProvisioningManager privisionManager =
|
||||||
ProvisioningManager.createForSubscriptionId(mSubId);
|
ProvisioningManager.createForSubscriptionId(mSubId);
|
||||||
return privisionManager.getProvisioningStatusForCapability(mCapability, mTech);
|
return privisionManager.getProvisioningStatusForCapability(mCapability, mTech);
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
Log.w(LOG_TAG, "fail to get Provisioning stat. subId=" + mSubId, exception);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -17,6 +17,7 @@
|
|||||||
package com.android.settings.network.ims;
|
package com.android.settings.network.ims;
|
||||||
|
|
||||||
import android.telephony.ims.ImsMmTelManager;
|
import android.telephony.ims.ImsMmTelManager;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -24,6 +25,8 @@ import android.telephony.ims.ImsMmTelManager;
|
|||||||
*/
|
*/
|
||||||
public class ImsQueryTtyOnVolteStat implements ImsQuery {
|
public class ImsQueryTtyOnVolteStat implements ImsQuery {
|
||||||
|
|
||||||
|
private static final String LOG_TAG = "QueryTtyOnVolteStat";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
* @param subId subscription id
|
* @param subId subscription id
|
||||||
@@ -40,7 +43,13 @@ public class ImsQueryTtyOnVolteStat implements ImsQuery {
|
|||||||
* @return result of query
|
* @return result of query
|
||||||
*/
|
*/
|
||||||
public boolean query() {
|
public boolean query() {
|
||||||
final ImsMmTelManager imsMmTelManager = ImsMmTelManager.createForSubscriptionId(mSubId);
|
try {
|
||||||
|
final ImsMmTelManager imsMmTelManager =
|
||||||
|
ImsMmTelManager.createForSubscriptionId(mSubId);
|
||||||
return imsMmTelManager.isTtyOverVolteEnabled();
|
return imsMmTelManager.isTtyOverVolteEnabled();
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
Log.w(LOG_TAG, "fail to get VoLte Tty Stat. subId=" + mSubId, exception);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -17,6 +17,7 @@
|
|||||||
package com.android.settings.network.ims;
|
package com.android.settings.network.ims;
|
||||||
|
|
||||||
import android.telephony.ims.ImsMmTelManager;
|
import android.telephony.ims.ImsMmTelManager;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -24,6 +25,8 @@ import android.telephony.ims.ImsMmTelManager;
|
|||||||
*/
|
*/
|
||||||
public class ImsQueryVtUserSetting implements ImsQuery {
|
public class ImsQueryVtUserSetting implements ImsQuery {
|
||||||
|
|
||||||
|
private static final String LOG_TAG = "QueryVtUserSetting";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
* @param subId subscription id
|
* @param subId subscription id
|
||||||
@@ -40,7 +43,13 @@ public class ImsQueryVtUserSetting implements ImsQuery {
|
|||||||
* @return result of query
|
* @return result of query
|
||||||
*/
|
*/
|
||||||
public boolean query() {
|
public boolean query() {
|
||||||
final ImsMmTelManager imsMmTelManager = ImsMmTelManager.createForSubscriptionId(mSubId);
|
try {
|
||||||
|
final ImsMmTelManager imsMmTelManager =
|
||||||
|
ImsMmTelManager.createForSubscriptionId(mSubId);
|
||||||
return imsMmTelManager.isVtSettingEnabled();
|
return imsMmTelManager.isVtSettingEnabled();
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
Log.w(LOG_TAG, "fail to get VT settings. subId=" + mSubId, exception);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -17,6 +17,7 @@
|
|||||||
package com.android.settings.network.ims;
|
package com.android.settings.network.ims;
|
||||||
|
|
||||||
import android.telephony.ims.ImsMmTelManager;
|
import android.telephony.ims.ImsMmTelManager;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -24,6 +25,8 @@ import android.telephony.ims.ImsMmTelManager;
|
|||||||
*/
|
*/
|
||||||
public class ImsQueryWfcUserSetting implements ImsQuery {
|
public class ImsQueryWfcUserSetting implements ImsQuery {
|
||||||
|
|
||||||
|
private static final String LOG_TAG = "QueryWfcUserSetting";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
* @param subId subscription id
|
* @param subId subscription id
|
||||||
@@ -40,7 +43,13 @@ public class ImsQueryWfcUserSetting implements ImsQuery {
|
|||||||
* @return result of query
|
* @return result of query
|
||||||
*/
|
*/
|
||||||
public boolean query() {
|
public boolean query() {
|
||||||
final ImsMmTelManager imsMmTelManager = ImsMmTelManager.createForSubscriptionId(mSubId);
|
try {
|
||||||
|
final ImsMmTelManager imsMmTelManager =
|
||||||
|
ImsMmTelManager.createForSubscriptionId(mSubId);
|
||||||
return imsMmTelManager.isVoWiFiSettingEnabled();
|
return imsMmTelManager.isVoWiFiSettingEnabled();
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
Log.w(LOG_TAG, "fail to get Wfc settings. subId=" + mSubId, exception);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user