Merge "Allow signing key rotation" into qt-qpr1-dev
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 556ec54..8d901a0 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -263,7 +263,7 @@
<string name="limited_sim_function_notification_message" msgid="2820647701127014781">"Baliteke <xliff:g id="CARRIER_NAME">%1$s</xliff:g> bidezko deiak eta datu-zerbitzuak blokeatuta egotea beste SIM txartel bat erabiltzean."</string>
<string name="data_usage_title" msgid="4042209259808900283">"Aplikazioak erabilitako datuak"</string>
<string name="data_usage_template" msgid="8526428824844656364">"Datuen <xliff:g id="ID_1">%1$s</xliff:g> erabili dira data hauen artean: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="advanced_options_title" msgid="8074895510265488035">"Ezarpen aurreratuak"</string>
+ <string name="advanced_options_title" msgid="8074895510265488035">"Aurreratuak"</string>
<string name="carrier_settings_euicc" msgid="6714062862127226405">"Operadorea"</string>
<string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operadorea, esim, esim txartela, sim, sim txartela, euicc, euicc txartela, aldatu operadoreak, aldatu operadorez, aldatu operadorea, gehitu operadorea, gehitu operadoreak"</string>
<string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>: <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 1012a9e..f2ff074 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -642,11 +642,10 @@
final CharSequence contentText = TextUtils.isEmpty(line1Num) ?
String.format(mContext.getText(
- R.string.limited_sim_function_notification_message).toString(),
- carrierName, line1Num) :
+ R.string.limited_sim_function_notification_message).toString(), carrierName) :
String.format(mContext.getText(
R.string.limited_sim_function_with_phone_num_notification_message).toString(),
- carrierName);
+ carrierName, line1Num);
final Notification.Builder builder = new Notification.Builder(mContext)
.setSmallIcon(R.drawable.ic_sim_card)
.setContentTitle(mContext.getText(
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index c557c0c..26f4c15 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6517,7 +6517,10 @@
if (card != null) {
cardId = card.getCardId();
} else {
- cardId = slot.getIccId();
+ cardId = slot.getEid();
+ if (TextUtils.isEmpty(cardId)) {
+ cardId = slot.getIccId();
+ }
}
int cardState = 0;
diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index 73f5de9..2965685 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -200,20 +200,11 @@
}
private boolean shouldShowRttSetting() {
- CarrierConfigManager configManager =
- (CarrierConfigManager) mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);
// Go through all the subs -- if we want to display the RTT setting for any of them, do
// display it.
for (int subId : SubscriptionController.getInstance().getActiveSubIdList(true)) {
- // In order to display the setting, we want:
- // 1. The subscription supports RTT
- // 2. The subscription isn't configured by the carrier to have the setting always-on
- // (see the documentation for the carrier config key)
if (PhoneGlobals.getInstance().phoneMgr.isRttSupported(subId)) {
- if (!configManager.getConfigForSubId(subId).getBoolean(
- CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL, false)) {
- return true;
- }
+ return true;
}
}
return false;