Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 16dad69..785feb5 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -376,7 +376,13 @@
<item msgid="1071057864355989694">"இணைவெழுத்து முறை"</item>
<item msgid="5012882784126308133">"சிறிய எழுத்துகள்"</item>
</string-array>
- <!-- no translation found for captioning_font_size_selector_titles:2 (3942006483573485941) -->
+ <string-array name="captioning_font_size_selector_titles">
+ <item msgid="923916134548435468">"மிகச் சிறியது"</item>
+ <item msgid="5738147437573674872">"சிறியது"</item>
+ <item msgid="3942006483573485941">"இயல்பு"</item>
+ <item msgid="824386705928670045">"பெரியது"</item>
+ <item msgid="2790561781512874585">"மிகப் பெரியது"</item>
+ </string-array>
<string-array name="captioning_edge_type_selector_titles">
<item msgid="70686029249840227">"இயல்புநிலை"</item>
<item msgid="4224714345662348668">"ஏதுமில்லை"</item>
@@ -391,7 +397,14 @@
<item msgid="2690365993149520846">"75%"</item>
<item msgid="3237802033158517495">"100%"</item>
</string-array>
- <!-- no translation found for captioning_preset_selector_titles:0 (3880932435325583041) -->
+ <string-array name="captioning_preset_selector_titles">
+ <item msgid="3880932435325583041">"ஆப்ஸின்படி அமை:"</item>
+ <item msgid="8719204526359229387">"கருப்பில் வெண்மை"</item>
+ <item msgid="5410164687403735103">"வெண்மையில் கருப்பு"</item>
+ <item msgid="1119043472912497241">"கருப்பில் மஞ்சள்"</item>
+ <item msgid="2836895041823327816">"நீலத்தில் மஞ்சள்"</item>
+ <item msgid="747238414788976867">"பிரத்தியேகம்"</item>
+ </string-array>
<string-array name="vpn_types_long">
<item msgid="6621806338070912611">"PPTP VPN"</item>
<item msgid="2552427673212085780">"பாதுகாப்பு விசைகளுடன் கூடிய L2TP/IPSec VPN"</item>
diff --git a/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java b/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java
index c00f1df..34d8430 100644
--- a/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java
+++ b/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java
@@ -17,6 +17,7 @@
package com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
+import android.util.Log;
/**
@@ -24,6 +25,7 @@
*/
public class ImsQueryEnhanced4gLteModeUserSetting implements ImsQuery {
+ private static final String LOG_TAG = "QueryEnhanced4gLteModeUserSetting";
/**
* Constructor
* @param subId subscription id
@@ -40,8 +42,13 @@
* @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;
}
}
diff --git a/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java b/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java
index 5c050b5..b52d22c 100644
--- a/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java
+++ b/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java
@@ -19,6 +19,7 @@
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 @@
*/
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 @@
* @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;
}
}
diff --git a/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java b/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java
index c2d655f..e2719dd 100644
--- a/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java
+++ b/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java
@@ -17,6 +17,7 @@
package com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
+import android.util.Log;
/**
@@ -24,6 +25,8 @@
*/
public class ImsQueryTtyOnVolteStat implements ImsQuery {
+ private static final String LOG_TAG = "QueryTtyOnVolteStat";
+
/**
* Constructor
* @param subId subscription id
@@ -40,7 +43,13 @@
* @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;
}
}
diff --git a/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java b/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java
index 6d699e3..6da4a4c 100644
--- a/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java
+++ b/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java
@@ -17,6 +17,7 @@
package com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
+import android.util.Log;
/**
@@ -24,6 +25,8 @@
*/
public class ImsQueryVtUserSetting implements ImsQuery {
+ private static final String LOG_TAG = "QueryVtUserSetting";
+
/**
* Constructor
* @param subId subscription id
@@ -40,7 +43,13 @@
* @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;
}
}
diff --git a/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java b/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java
index 22d2c67..3407413 100644
--- a/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java
+++ b/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java
@@ -17,6 +17,7 @@
package com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
+import android.util.Log;
/**
@@ -24,6 +25,8 @@
*/
public class ImsQueryWfcUserSetting implements ImsQuery {
+ private static final String LOG_TAG = "QueryWfcUserSetting";
+
/**
* Constructor
* @param subId subscription id
@@ -40,7 +43,13 @@
* @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;
}
}