Merge "RTT changes for ignoring user-set setting" into qt-r1-dev
am: 24b06bbc0f
Change-Id: Ie4f4e268fb279650de1d2a296810c4b53235c232
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index f846111..abae4fc 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -286,8 +286,8 @@
}
PersistableBundle config =
resultData.getParcelable(KEY_CONFIG_BUNDLE);
- saveConfigToXml(
- mPlatformCarrierConfigPackage, phoneId, config);
+ saveConfigToXml(mPlatformCarrierConfigPackage, phoneId,
+ carrierId, config);
mConfigFromDefaultApp[phoneId] = config;
sendMessage(
obtainMessage(
@@ -417,8 +417,8 @@
}
PersistableBundle config =
resultData.getParcelable(KEY_CONFIG_BUNDLE);
- saveConfigToXml(
- getCarrierPackageForPhoneId(phoneId), phoneId, config);
+ saveConfigToXml(getCarrierPackageForPhoneId(phoneId), phoneId,
+ carrierId, config);
mConfigFromCarrierApp[phoneId] = config;
sendMessage(
obtainMessage(
@@ -713,9 +713,11 @@
*
* @param packageName the name of the package from which we fetched this bundle.
* @param phoneId the phone ID.
+ * @param carrierId contains all carrier-identifying information.
* @param config the bundle to be written. Null will be treated as an empty bundle.
*/
- private void saveConfigToXml(String packageName, int phoneId, PersistableBundle config) {
+ private void saveConfigToXml(String packageName, int phoneId, CarrierIdentifier carrierId,
+ PersistableBundle config) {
if (SubscriptionManager.getSimStateForSlotIndex(phoneId)
!= TelephonyManager.SIM_STATE_LOADED) {
loge("Skip save config because SIM records are not loaded.");
@@ -723,7 +725,7 @@
}
final String iccid = getIccIdForPhoneId(phoneId);
- final int cid = getSpecificCarrierIdForPhoneId(phoneId);
+ final int cid = carrierId.getSpecificCarrierId();
if (packageName == null || iccid == null) {
loge("Cannot save config with null packageName or iccid.");
return;
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e1a9592..bf95c74 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2030,14 +2030,18 @@
/**
* Returns the target SDK version number for a given package name.
*
+ * This call MUST be invoked before clearing the calling UID.
+ *
* @return target SDK if the package is found or INT_MAX.
*/
private int getTargetSdk(String packageName) {
try {
- final ApplicationInfo ai = mApp.getPackageManager().getApplicationInfo(
- packageName, 0);
+ final ApplicationInfo ai = mApp.getPackageManager().getApplicationInfoAsUser(
+ packageName, 0, UserHandle.getUserId(Binder.getCallingUid()));
if (ai != null) return ai.targetSdkVersion;
} catch (PackageManager.NameNotFoundException unexpected) {
+ loge("Failed to get package info for pkg="
+ + packageName + ", uid=" + Binder.getCallingUid());
}
return Integer.MAX_VALUE;
}
diff --git a/src/com/android/services/telephony/GsmConnection.java b/src/com/android/services/telephony/GsmConnection.java
index 999c6f5..47434c0 100644
--- a/src/com/android/services/telephony/GsmConnection.java
+++ b/src/com/android/services/telephony/GsmConnection.java
@@ -72,9 +72,8 @@
int capabilities = super.buildConnectionCapabilities();
capabilities |= CAPABILITY_MUTE;
// Overwrites TelephonyConnection.buildConnectionCapabilities() and resets the hold options
- // because all GSM calls should hold, even if the carrier config option is set to not show
- // hold for IMS calls.
- if (!shouldTreatAsEmergencyCall()) {
+ // because all GSM calls should hold.
+ if (!shouldTreatAsEmergencyCall() && !isImsConnection()) {
capabilities |= CAPABILITY_SUPPORT_HOLD;
if (isHoldable() && (getState() == STATE_ACTIVE || getState() == STATE_HOLDING)) {
capabilities |= CAPABILITY_HOLD;