Merge "Support hiding manage IMS conference call button"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 565a74a..6b84c74 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -27,7 +27,7 @@
<string name="onHold" msgid="9035493194749959955">"معلقة"</string>
<string name="mmiStarted" msgid="6347869857061147003">"بدأ رمز MMI"</string>
<string name="ussdRunning" msgid="485588686340541690">"جارٍ تشغيل رمز USSD..."</string>
- <string name="mmiCancelled" msgid="2771923949751842276">"تم إلغاء كود MMI"</string>
+ <string name="mmiCancelled" msgid="2771923949751842276">"تم إلغاء رمز MMI"</string>
<string name="cancel" msgid="5044513931633602634">"إلغاء"</string>
<string name="enter_input" msgid="1810529547726803893">"يجب أن تتراوح حروف رسالة USSD بين <xliff:g id="MIN_LEN">%d</xliff:g> و<xliff:g id="MAX_LEN">%d</xliff:g>. يُرجى إعادة المحاولة."</string>
<string name="manageConferenceLabel" msgid="4691922394301969053">"إدارة مكالمة جماعية"</string>
@@ -420,7 +420,7 @@
<string name="pin2_invalid" msgid="5470854099230755944">"لم يتم تحديث FDN لأنك كتبت رقم تعريف شخصي غير صحيح."</string>
<string name="fdn_invalid_number" msgid="8602417141715473998">"لم يتم تحديث FDN نظرًا لأن الرقم فارغ أو يتجاوز طوله 20 رقمًا."</string>
<string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"لم يتم تحديث FDN. رقم PIN2 غير صحيح، أو تم رفض رقم الهاتف."</string>
- <string name="fdn_failed" msgid="540018079008319747">"أخفقت عملية FDN!"</string>
+ <string name="fdn_failed" msgid="540018079008319747">"تعذّر إتمام عملية FDN!"</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"جارٍ القراءة من شريحة SIM..."</string>
<string name="simContacts_empty" msgid="5270660846489561932">"ليس هناك جهات اتصال على شريحة SIM."</string>
<string name="simContacts_title" msgid="1861472842524839921">"حدد جهات اتصال لاستيرادها"</string>
@@ -483,7 +483,7 @@
<string name="incall_error_out_of_service" msgid="8587993036435080418">"شبكة الجوال غير متاحة."</string>
<string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"شبكة الجوّال ليست متوفرة. اتصل بشبكة لاسلكية لإجراء مكالمة."</string>
<string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"لإجراء مكالمة، أدخل رقمًا صالحًا."</string>
- <string name="incall_error_call_failed" msgid="5891978320269774095">"أخفقت المكالمة."</string>
+ <string name="incall_error_call_failed" msgid="5891978320269774095">"تعذّرت المكالمة."</string>
<string name="incall_error_cannot_add_call" msgid="8878159278947023326">"يتعذر إجراء المكالمة في الوقت الحالي. يمكنك محاولة التواصل من خلال إرسال رسالة."</string>
<string name="incall_error_supp_service_unknown" msgid="655570339115407698">"الخدمة ليست متوفرة"</string>
<string name="incall_error_supp_service_switch" msgid="5237002176899962862">"يتعذر تبديل المكالمات."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 874108a..66d3c5a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -598,7 +598,7 @@
<string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Zana za walio na matatizo ya kuona au kusikia"</string>
<string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"Simu ya Wi-Fi kutoka kwa"</string>
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Simu ya Wi-Fi"</string>
- <string name="emergency_action_launch_hint" msgid="4906759256275562674">"Gonga tena ili ufungue"</string>
+ <string name="emergency_action_launch_hint" msgid="4906759256275562674">"Gusa tena ili ufungue"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Hitilafu imetokea wakati wa usimbuaji wa ujumbe."</string>
<string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM kadi yako imeanzisha huduma yako na kusasisha uwezo wa simu yako wa kutumia mitandao mingine."</string>
<string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"Kuna simu nyingi mno zinazoendelea. Tafadhali kata au uunganishe simu zinazoendelea kabla hujapiga nyingine."</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index a2ded72..7bad9fc 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -238,7 +238,7 @@
<string name="roaming_enable" msgid="7331106985174381987">"ரோமிங்கின் போது தரவு சேவைகளுடன் இணை"</string>
<string name="roaming_disable" msgid="1843417228755568110">"ரோமிங்கின் போது தரவு சேவைகளுடன் இணை"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"உள்ளூர் நெட்வொர்க்கில் தரவு ரோமிங்கை முடக்கிய நிலையில் வெளியேறியுள்ளதால், தரவு இணைப்பை இழந்துவிட்டீர்கள்."</string>
- <string name="roaming_warning" msgid="1603164667540144353">"குறிப்பிடத்தக்க கட்டணங்கள் இருக்கலாம்."</string>
+ <string name="roaming_warning" msgid="1603164667540144353">"குறிப்பிடத்தக்க பேமெண்ட்கள் இருக்கலாம்."</string>
<string name="roaming_alert_title" msgid="3654815360303826008">"தரவு ரோமிங்கை அனுமதிக்கவா?"</string>
<string name="data_usage_title" msgid="8759619109516889802">"டேட்டா பயன்பாடு"</string>
<string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g> மொபைல் டேட்டா பயன்படுத்தப்பட்டது"</string>
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ea57c81..d199100 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -39,6 +39,7 @@
import android.os.Message;
import android.os.Messenger;
import android.os.PersistableBundle;
+import android.os.Process;
import android.os.ResultReceiver;
import android.os.ServiceManager;
import android.os.UserHandle;
@@ -75,10 +76,12 @@
import android.util.Slog;
import com.android.ims.ImsManager;
-import com.android.ims.internal.IImsServiceController;
-import com.android.ims.internal.IImsServiceFeatureListener;
+import com.android.ims.internal.IImsMMTelFeature;
+import com.android.ims.internal.IImsRcsFeature;
+import com.android.ims.internal.IImsServiceFeatureCallback;
import com.android.internal.telephony.CallManager;
import com.android.internal.telephony.CallStateException;
+import com.android.internal.telephony.CarrierInfoManager;
import com.android.internal.telephony.CellNetworkScanResult;
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.DefaultPhoneNotifier;
@@ -2561,16 +2564,37 @@
}
/**
- * Returns the {@link IImsServiceController} that corresponds to the given slot Id and IMS
- * feature or {@link null} if the service is not available. If an ImsServiceController is
- * available, the {@link IImsServiceFeatureListener} callback is registered as a listener for
- * feature updates.
+ * Returns the {@link IImsMMTelFeature} that corresponds to the given slot Id for the MMTel
+ * feature or {@link null} if the service is not available. If the feature is available, the
+ * {@link IImsServiceFeatureCallback} callback is registered as a listener for feature updates.
*/
- public IImsServiceController getImsServiceControllerAndListen(int slotIndex, int feature,
- IImsServiceFeatureListener callback) {
+ public IImsMMTelFeature getMMTelFeatureAndListen(int slotId,
+ IImsServiceFeatureCallback callback) {
enforceModifyPermission();
- return PhoneFactory.getImsResolver().getImsServiceControllerAndListen(slotIndex, feature,
- callback);
+ return PhoneFactory.getImsResolver().getMMTelFeatureAndListen(slotId, callback);
+ }
+
+ /**
+ * Returns the {@link IImsMMTelFeature} that corresponds to the given slot Id for the MMTel
+ * feature during emergency calling or {@link null} if the service is not available. If the
+ * feature is available, the {@link IImsServiceFeatureCallback} callback is registered as a
+ * listener for feature updates.
+ */
+ public IImsMMTelFeature getEmergencyMMTelFeatureAndListen(int slotId,
+ IImsServiceFeatureCallback callback) {
+ enforceModifyPermission();
+ return PhoneFactory.getImsResolver().getEmergencyMMTelFeatureAndListen(slotId, callback);
+ }
+
+ /**
+ * Returns the {@link IImsRcsFeature} that corresponds to the given slot Id for the RCS
+ * feature during emergency calling or {@link null} if the service is not available. If the
+ * feature is available, the {@link IImsServiceFeatureCallback} callback is registered as a
+ * listener for feature updates.
+ */
+ public IImsRcsFeature getRcsFeatureAndListen(int slotId, IImsServiceFeatureCallback callback) {
+ enforceModifyPermission();
+ return PhoneFactory.getImsResolver().getRcsFeatureAndListen(slotId, callback);
}
public void setImsRegistrationState(boolean registered) {
@@ -3269,6 +3293,8 @@
setPreferredNetworkType(subId, Phone.PREFERRED_NT_MODE);
// Turn off roaming
mPhone.setDataRoamingEnabled(false);
+ // Remove IMSI encryption keys from Carrier DB.
+ CarrierInfoManager.deleteAllCarrierKeysForImsiEncryption(mPhone.getContext());
}
} finally {
Binder.restoreCallingIdentity(identity);
diff --git a/src/com/android/phone/settings/AccessibilitySettingsActivity.java b/src/com/android/phone/settings/AccessibilitySettingsActivity.java
index 769ef61..99b1478 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsActivity.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsActivity.java
@@ -16,6 +16,7 @@
package com.android.phone.settings;
+import android.app.ActionBar;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.view.MenuItem;
@@ -27,8 +28,10 @@
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
-
- getActionBar().setTitle(R.string.accessibility_settings_activity_title);
+ final ActionBar actionBar = getActionBar();
+ if (actionBar != null) {
+ actionBar.setTitle(R.string.accessibility_settings_activity_title);
+ }
getFragmentManager().beginTransaction().replace(
android.R.id.content, new AccessibilitySettingsFragment()).commit();
}
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index 4d55421..74b8e4e 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -32,6 +32,7 @@
import android.preference.SwitchPreference;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.Settings;
+import android.telecom.PhoneAccountHandle;
import android.telephony.CarrierConfigManager;
import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
@@ -48,6 +49,7 @@
import com.android.internal.telephony.util.NotificationChannelController;
import com.android.phone.EditPhoneNumberPreference;
import com.android.phone.PhoneGlobals;
+import com.android.phone.PhoneUtils;
import com.android.phone.R;
import com.android.phone.SubscriptionInfoHelper;
@@ -222,6 +224,12 @@
mShowVoicemailPreference = (icicle == null) &&
TextUtils.equals(getIntent().getAction(), ACTION_ADD_VOICEMAIL);
+ PhoneAccountHandle phoneAccountHandle = (PhoneAccountHandle)
+ getIntent().getParcelableExtra(TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE);
+ if (phoneAccountHandle != null) {
+ getIntent().putExtra(SubscriptionInfoHelper.SUB_ID_EXTRA,
+ PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccountHandle));
+ }
mSubscriptionInfoHelper = new SubscriptionInfoHelper(this, getIntent());
mSubscriptionInfoHelper.setActionBarTitle(
getActionBar(), getResources(), R.string.voicemail_settings_with_label);