Merge "Do not use hidden API XmlUtils."
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt
index 2b32c24..45be9f5 100644
--- a/jarjar-rules-shared.txt
+++ b/jarjar-rules-shared.txt
@@ -2,11 +2,9 @@
rule android.os.Registrant* com.android.internal.telephony.Registrant@1
rule android.hidl.** android.internal.hidl.@1
rule android.util.LocalLog* com.android.internal.telephony.LocalLog@1
-rule android.util.Slog* com.android.internal.telephony.Slog@1
rule android.util.TimeUtils* com.android.internal.telephony.TimeUtils@1
rule com.android.internal.os.SomeArgs* com.android.internal.telephony.SomeArgs@1
rule com.android.internal.util.ArrayUtils* com.android.internal.telephony.ArrayUtils@1
-rule com.android.internal.util.DumpUtils* com.android.internal.telephony.DumpUtils@1
rule com.android.internal.util.FastXmlSerializer* com.android.internal.telephony.FastXmlSerializer@1
rule com.android.internal.util.HexDump* com.android.internal.telephony.HexDump@1
rule com.android.internal.util.IndentingPrintWriter* com.android.internal.telephony.IndentingPrintWriter@1
diff --git a/src/java/com/android/internal/telephony/BtSmsInterfaceManager.java b/src/java/com/android/internal/telephony/BtSmsInterfaceManager.java
index 67e07bc..ea6a6ec 100644
--- a/src/java/com/android/internal/telephony/BtSmsInterfaceManager.java
+++ b/src/java/com/android/internal/telephony/BtSmsInterfaceManager.java
@@ -17,12 +17,11 @@
package com.android.internal.telephony;
-import android.app.ActivityThread;
import android.app.PendingIntent;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothMapClient;
import android.bluetooth.BluetoothProfile;
+import android.content.Context;
import android.net.Uri;
import android.telecom.PhoneAccount;
import android.telephony.SmsManager;
@@ -40,7 +39,7 @@
/**
* Sends text through connected Bluetooth device
*/
- public void sendText(String destAddr, String text, PendingIntent sentIntent,
+ public void sendText(Context context, String destAddr, String text, PendingIntent sentIntent,
PendingIntent deliveryIntent, SubscriptionInfo info) {
BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter();
if (btAdapter == null) {
@@ -54,7 +53,7 @@
sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_INVALID_BLUETOOTH_ADDRESS);
return;
}
- btAdapter.getProfileProxy(ActivityThread.currentApplication().getApplicationContext(),
+ btAdapter.getProfileProxy(context.getApplicationContext(),
new MapMessageSender(destAddr, text, device, sentIntent, deliveryIntent),
BluetoothProfile.MAP_CLIENT);
}
@@ -99,14 +98,19 @@
if (profile != BluetoothProfile.MAP_CLIENT) {
return;
}
- BluetoothMapClient mapProfile = (BluetoothMapClient) proxy;
+ // Comment out the method for mainline (b/143848423). The profile is not for a phone,
+ // so it will not be enabled.
+/* BluetoothMapClient mapProfile = (BluetoothMapClient) proxy;
if (mMessage != null) {
Log.d(LOG_TAG, "Sending message thru bluetooth");
mapProfile.sendMessage(mDevice, mDestAddr, mMessage, mSentIntent, mDeliveryIntent);
mMessage = null;
}
BluetoothAdapter.getDefaultAdapter()
- .closeProfileProxy(BluetoothProfile.MAP_CLIENT, mapProfile);
+ .closeProfileProxy(BluetoothProfile.MAP_CLIENT, mapProfile);*/
+ if (mMessage != null) {
+ throw new RuntimeException("Can't send message through BluetoothMapClient");
+ }
}
@Override
diff --git a/src/java/com/android/internal/telephony/CarrierSignalAgent.java b/src/java/com/android/internal/telephony/CarrierSignalAgent.java
index ad753db..e9c3a73 100644
--- a/src/java/com/android/internal/telephony/CarrierSignalAgent.java
+++ b/src/java/com/android/internal/telephony/CarrierSignalAgent.java
@@ -36,7 +36,7 @@
import android.util.LocalLog;
import android.util.Log;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import com.android.internal.util.IndentingPrintWriter;
import java.io.FileDescriptor;
diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index 41e0053..898f7b9 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -100,7 +100,7 @@
import com.android.internal.telephony.uicc.UiccController;
import com.android.internal.telephony.uicc.UiccProfile;
import com.android.internal.telephony.uicc.UiccSlot;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import java.io.FileDescriptor;
import java.io.PrintWriter;
diff --git a/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java b/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
index d2f256a..66a86e6 100644
--- a/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
+++ b/src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
@@ -24,8 +24,11 @@
import android.annotation.UnsupportedAppUsage;
import android.app.AppOpsManager;
import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.database.sqlite.SQLiteException;
@@ -36,9 +39,11 @@
import android.os.Message;
import android.os.UserManager;
import android.provider.Telephony;
+import android.telephony.CarrierConfigManager;
import android.telephony.Rlog;
import android.telephony.SmsManager;
import android.telephony.SmsMessage;
+import android.telephony.SubscriptionManager;
import android.telephony.emergency.EmergencyNumber;
import android.util.LocalLog;
import android.util.Log;
@@ -181,6 +186,21 @@
mAppOps = appOps;
mDispatchersController = dispatchersController;
mSmsPermissions = new SmsPermissions(phone, context, appOps);
+
+ mContext.registerReceiver(
+ new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED
+ .equals(intent.getAction())) {
+ if (mPhone.getPhoneId() == intent.getIntExtra(
+ CarrierConfigManager.EXTRA_SLOT_INDEX,
+ SubscriptionManager.INVALID_SIM_SLOT_INDEX)) {
+ mCellBroadcastRangeManager.updateRanges();
+ }
+ }
+ }
+ }, new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
}
protected void markMessagesAsRead(ArrayList<byte[]> messages) {
diff --git a/src/java/com/android/internal/telephony/InboundSmsHandler.java b/src/java/com/android/internal/telephony/InboundSmsHandler.java
index bd08f91..808c1b7 100644
--- a/src/java/com/android/internal/telephony/InboundSmsHandler.java
+++ b/src/java/com/android/internal/telephony/InboundSmsHandler.java
@@ -1166,7 +1166,7 @@
UserHandle targetUser = UserHandle.of(users[i]);
if (users[i] != UserHandle.USER_SYSTEM) {
// Is the user not allowed to use SMS?
- if (mUserManager.hasUserRestriction(UserManager.DISALLOW_SMS, targetUser)) {
+ if (hasUserRestriction(UserManager.DISALLOW_SMS, targetUser)) {
continue;
}
// Skip unknown users and managed profiles as well
@@ -1195,6 +1195,12 @@
}
}
+ private boolean hasUserRestriction(String restrictionKey, UserHandle userHandle) {
+ final List<UserManager.EnforcingUser> sources = mUserManager
+ .getUserRestrictionSources(restrictionKey, userHandle);
+ return (sources != null && !sources.isEmpty());
+ }
+
/**
* Helper for {@link SmsBroadcastUndelivered} to delete an old message in the raw table.
*/
diff --git a/src/java/com/android/internal/telephony/LocaleTracker.java b/src/java/com/android/internal/telephony/LocaleTracker.java
index 4b8a043..40e94eb 100755
--- a/src/java/com/android/internal/telephony/LocaleTracker.java
+++ b/src/java/com/android/internal/telephony/LocaleTracker.java
@@ -58,7 +58,6 @@
*/
public class LocaleTracker extends Handler {
private static final boolean DBG = true;
- private static final String TAG = LocaleTracker.class.getSimpleName();
/** Event for getting cell info from the modem */
private static final int EVENT_REQUEST_CELL_INFO = 1;
@@ -125,6 +124,8 @@
/** The maximum fail count to prevent delay time overflow */
private static final int MAX_FAIL_COUNT = 30;
+ private String mTag;
+
private final Phone mPhone;
private final NitzStateMachine mNitzStateMachine;
@@ -241,6 +242,7 @@
mPhone = phone;
mNitzStateMachine = nitzStateMachine;
mSimState = TelephonyManager.SIM_STATE_UNKNOWN;
+ mTag = LocaleTracker.class.getSimpleName() + "-" + mPhone.getPhoneId();
final IntentFilter filter = new IntentFilter();
filter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);
@@ -611,11 +613,11 @@
}
private void log(String msg) {
- Rlog.d(TAG, msg);
+ Rlog.d(mTag, msg);
}
private void loge(String msg) {
- Rlog.e(TAG, msg);
+ Rlog.e(mTag, msg);
}
/**
@@ -627,7 +629,7 @@
*/
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ");
- pw.println("LocaleTracker:");
+ pw.println("LocaleTracker-" + mPhone.getPhoneId() + ":");
ipw.increaseIndent();
ipw.println("mIsTracking = " + mIsTracking);
ipw.println("mOperatorNumeric = " + mOperatorNumeric);
diff --git a/src/java/com/android/internal/telephony/MccTable.java b/src/java/com/android/internal/telephony/MccTable.java
index d4c2e9a..1016cbe 100644
--- a/src/java/com/android/internal/telephony/MccTable.java
+++ b/src/java/com/android/internal/telephony/MccTable.java
@@ -26,8 +26,8 @@
import android.os.Build;
import android.os.RemoteException;
import android.os.SystemProperties;
+import android.telephony.Rlog;
import android.text.TextUtils;
-import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
@@ -260,7 +260,7 @@
public static String defaultLanguageForMcc(int mcc) {
MccEntry entry = entryForMcc(mcc);
if (entry == null) {
- Slog.d(LOG_TAG, "defaultLanguageForMcc(" + mcc + "): no country for mcc");
+ Rlog.d(LOG_TAG, "defaultLanguageForMcc(" + mcc + "): no country for mcc");
return null;
}
@@ -274,8 +274,8 @@
// Ask CLDR for the language this country uses...
ULocale likelyLocale = ULocale.addLikelySubtags(new ULocale("und", country));
String likelyLanguage = likelyLocale.getLanguage();
- Slog.d(LOG_TAG, "defaultLanguageForMcc(" + mcc + "): country " + country + " uses " +
- likelyLanguage);
+ Rlog.d(LOG_TAG, "defaultLanguageForMcc(" + mcc + "): country " + country + " uses "
+ + likelyLanguage);
return likelyLanguage;
}
@@ -306,13 +306,13 @@
* @param mccmnc truncated imsi with just the MCC and MNC - MNC assumed to be from 4th to end
*/
public static void updateMccMncConfiguration(Context context, String mccmnc) {
- Slog.d(LOG_TAG, "updateMccMncConfiguration mccmnc='" + mccmnc);
+ Rlog.d(LOG_TAG, "updateMccMncConfiguration mccmnc='" + mccmnc);
if (Build.IS_DEBUGGABLE) {
String overrideMcc = SystemProperties.get("persist.sys.override_mcc");
if (!TextUtils.isEmpty(overrideMcc)) {
mccmnc = overrideMcc;
- Slog.d(LOG_TAG, "updateMccMncConfiguration overriding mccmnc='" + mccmnc + "'");
+ Rlog.d(LOG_TAG, "updateMccMncConfiguration overriding mccmnc='" + mccmnc + "'");
}
}
@@ -323,11 +323,11 @@
mcc = Integer.parseInt(mccmnc.substring(0, 3));
mnc = Integer.parseInt(mccmnc.substring(3));
} catch (NumberFormatException | StringIndexOutOfBoundsException ex) {
- Slog.e(LOG_TAG, "Error parsing IMSI: " + mccmnc + ". ex=" + ex);
+ Rlog.e(LOG_TAG, "Error parsing IMSI: " + mccmnc + ". ex=" + ex);
return;
}
- Slog.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc);
+ Rlog.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc);
try {
Configuration config = new Configuration();
@@ -339,13 +339,13 @@
}
if (updateConfig) {
- Slog.d(LOG_TAG, "updateMccMncConfiguration updateConfig config=" + config);
+ Rlog.d(LOG_TAG, "updateMccMncConfiguration updateConfig config=" + config);
ActivityManager.getService().updateConfiguration(config);
} else {
- Slog.d(LOG_TAG, "updateMccMncConfiguration nothing to update");
+ Rlog.d(LOG_TAG, "updateMccMncConfiguration nothing to update");
}
} catch (RemoteException e) {
- Slog.e(LOG_TAG, "Can't update configuration", e);
+ Rlog.e(LOG_TAG, "Can't update configuration", e);
}
}
}
@@ -400,7 +400,7 @@
private static Locale getLocaleForLanguageCountry(Context context, String language,
String country) {
if (language == null) {
- Slog.d(LOG_TAG, "getLocaleForLanguageCountry: skipping no language");
+ Rlog.d(LOG_TAG, "getLocaleForLanguageCountry: skipping no language");
return null; // no match possible
}
if (country == null) {
@@ -428,8 +428,8 @@
if (l.getLanguage().equals(target.getLanguage())) {
// If we got a perfect match, we're done.
if (l.getCountry().equals(target.getCountry())) {
- Slog.d(LOG_TAG, "getLocaleForLanguageCountry: got perfect match: " +
- l.toLanguageTag());
+ Rlog.d(LOG_TAG, "getLocaleForLanguageCountry: got perfect match: "
+ + l.toLanguageTag());
return l;
}
@@ -439,13 +439,13 @@
}
if (languageMatches.isEmpty()) {
- Slog.d(LOG_TAG, "getLocaleForLanguageCountry: no locales for language " + language);
+ Rlog.d(LOG_TAG, "getLocaleForLanguageCountry: no locales for language " + language);
return null;
}
Locale bestMatch = lookupFallback(target, languageMatches);
if (bestMatch != null) {
- Slog.d(LOG_TAG, "getLocaleForLanguageCountry: got a fallback match: "
+ Rlog.d(LOG_TAG, "getLocaleForLanguageCountry: got a fallback match: "
+ bestMatch.toLanguageTag());
return bestMatch;
} else {
@@ -459,7 +459,7 @@
LocaleStore.fillCache(context);
LocaleInfo targetInfo = LocaleStore.getLocaleInfo(target);
if (targetInfo.isTranslated()) {
- Slog.d(LOG_TAG, "getLocaleForLanguageCountry: "
+ Rlog.d(LOG_TAG, "getLocaleForLanguageCountry: "
+ "target locale is translated: " + target);
return target;
}
@@ -469,12 +469,12 @@
// unless we get a perfect match later. Note that these come back in no
// particular order, so there's no reason to think the first match is
// a particularly good match.
- Slog.d(LOG_TAG, "getLocaleForLanguageCountry: got language-only match: "
+ Rlog.d(LOG_TAG, "getLocaleForLanguageCountry: got language-only match: "
+ language);
return languageMatches.get(0);
}
} catch (Exception e) {
- Slog.d(LOG_TAG, "getLocaleForLanguageCountry: exception", e);
+ Rlog.d(LOG_TAG, "getLocaleForLanguageCountry: exception", e);
}
return null;
@@ -494,14 +494,14 @@
String language = hasSimLanguage ? simLanguage : MccTable.defaultLanguageForMcc(mcc);
String country = MccTable.countryCodeForMcc(mcc);
- Slog.d(LOG_TAG, "getLocaleFromMcc(" + language + ", " + country + ", " + mcc);
+ Rlog.d(LOG_TAG, "getLocaleFromMcc(" + language + ", " + country + ", " + mcc);
final Locale locale = getLocaleForLanguageCountry(context, language, country);
// If we couldn't find a locale that matches the SIM language, give it a go again
// with the "likely" language for the given country.
if (locale == null && hasSimLanguage) {
language = MccTable.defaultLanguageForMcc(mcc);
- Slog.d(LOG_TAG, "[retry ] getLocaleFromMcc(" + language + ", " + country + ", " + mcc);
+ Rlog.d(LOG_TAG, "[retry ] getLocaleFromMcc(" + language + ", " + country + ", " + mcc);
return getLocaleForLanguageCountry(context, language, country);
}
diff --git a/src/java/com/android/internal/telephony/MultiSimSettingController.java b/src/java/com/android/internal/telephony/MultiSimSettingController.java
index 1ce360f..3610be8 100644
--- a/src/java/com/android/internal/telephony/MultiSimSettingController.java
+++ b/src/java/com/android/internal/telephony/MultiSimSettingController.java
@@ -51,7 +51,7 @@
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
index db76e84..ae3b778 100644
--- a/src/java/com/android/internal/telephony/Phone.java
+++ b/src/java/com/android/internal/telephony/Phone.java
@@ -2585,7 +2585,8 @@
options.setBackgroundActivityStartsAllowed(true);
Intent intent = new Intent(TelephonyIntents.SECRET_CODE_ACTION,
Uri.parse("android_secret_code://" + code));
- intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+ intent.addFlags(
+ Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND | Intent.FLAG_RECEIVER_FOREGROUND);
mContext.sendBroadcast(intent, null, options.toBundle());
// {@link TelephonyManager.ACTION_SECRET_CODE} will replace {@link
@@ -2593,7 +2594,8 @@
// that both of these two actions will be broadcast.
Intent secrectCodeIntent = new Intent(TelephonyManager.ACTION_SECRET_CODE,
Uri.parse("android_secret_code://" + code));
- secrectCodeIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+ secrectCodeIntent.addFlags(
+ Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND | Intent.FLAG_RECEIVER_FOREGROUND);
mContext.sendBroadcast(secrectCodeIntent, null, options.toBundle());
}
}
diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 821a3ec..fc796ca 100755
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -111,7 +111,7 @@
import com.android.internal.telephony.uicc.UiccController;
import com.android.internal.telephony.uicc.UiccProfile;
import com.android.internal.telephony.util.NotificationChannelController;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import com.android.internal.util.IndentingPrintWriter;
import java.io.FileDescriptor;
@@ -5226,7 +5226,7 @@
if (currentServiceState.getVoiceRoaming()) {
if (mPhone.isPhoneTypeGsm()) {
// check roaming type by MCC
- if (inSameCountry(currentServiceState.getVoiceOperatorNumeric())) {
+ if (inSameCountry(currentServiceState.getOperatorNumeric())) {
currentServiceState.setVoiceRoamingType(
ServiceState.ROAMING_TYPE_DOMESTIC);
} else {
@@ -5250,7 +5250,7 @@
}
} else {
// check roaming type by MCC
- if (inSameCountry(currentServiceState.getVoiceOperatorNumeric())) {
+ if (inSameCountry(currentServiceState.getOperatorNumeric())) {
currentServiceState.setVoiceRoamingType(
ServiceState.ROAMING_TYPE_DOMESTIC);
} else {
@@ -5297,7 +5297,7 @@
}
} else {
// take it as 3GPP roaming
- if (inSameCountry(currentServiceState.getDataOperatorNumeric())) {
+ if (inSameCountry(currentServiceState.getOperatorNumeric())) {
currentServiceState.setDataRoamingType(ServiceState.ROAMING_TYPE_DOMESTIC);
} else {
currentServiceState.setDataRoamingType(
diff --git a/src/java/com/android/internal/telephony/SmsController.java b/src/java/com/android/internal/telephony/SmsController.java
index eaa7fc8..64a5ab9 100644
--- a/src/java/com/android/internal/telephony/SmsController.java
+++ b/src/java/com/android/internal/telephony/SmsController.java
@@ -18,12 +18,11 @@
package com.android.internal.telephony;
-import static com.android.internal.util.DumpUtils.checkDumpPermission;
+import static com.android.internal.telephony.util.TelephonyUtils.checkDumpPermission;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.app.ActivityManager;
-import android.app.ActivityThread;
import android.app.AppOpsManager;
import android.app.PendingIntent;
import android.content.Context;
@@ -189,7 +188,7 @@
private void sendBluetoothText(SubscriptionInfo info, String destAddr,
String text, PendingIntent sentIntent, PendingIntent deliveryIntent) {
BtSmsInterfaceManager btSmsInterfaceManager = new BtSmsInterfaceManager();
- btSmsInterfaceManager.sendText(destAddr, text, sentIntent, deliveryIntent, info);
+ btSmsInterfaceManager.sendText(mContext, destAddr, text, sentIntent, deliveryIntent, info);
}
private void sendIccText(int subId, String callingPackage, String destAddr,
@@ -367,7 +366,7 @@
@Override
public boolean isSmsSimPickActivityNeeded(int subId) {
- final Context context = ActivityThread.currentApplication().getApplicationContext();
+ final Context context = mContext.getApplicationContext();
ActivityManager am = context.getSystemService(ActivityManager.class);
// Don't show the SMS SIM Pick activity if it is not foreground.
boolean isCallingProcessForeground = am != null
diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index c483836..08112f0 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -46,6 +46,7 @@
import android.telephony.Rlog;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.telephony.SubscriptionManager.SimDisplayNameSource;
import android.telephony.TelephonyManager;
import android.telephony.UiccAccessRule;
import android.telephony.UiccSlotInfo;
@@ -62,7 +63,7 @@
import com.android.internal.telephony.uicc.UiccCard;
import com.android.internal.telephony.uicc.UiccController;
import com.android.internal.telephony.util.TelephonyUtils;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -1505,30 +1506,27 @@
* @param nameSource Source of display name
* @return int representing the priority. Higher value means higher priority.
*/
- public static int getNameSourcePriority(int nameSource) {
- switch (nameSource) {
- case SubscriptionManager.NAME_SOURCE_USER_INPUT:
- return 3;
- case SubscriptionManager.NAME_SOURCE_CARRIER:
- return 2;
- case SubscriptionManager.NAME_SOURCE_SIM_SOURCE:
- return 1;
- case SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE:
- default:
- return 0;
- }
+ public static int getNameSourcePriority(@SimDisplayNameSource int nameSource) {
+ int index = Arrays.asList(
+ SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE,
+ SubscriptionManager.NAME_SOURCE_SIM_PNN,
+ SubscriptionManager.NAME_SOURCE_SIM_SPN,
+ SubscriptionManager.NAME_SOURCE_CARRIER,
+ SubscriptionManager.NAME_SOURCE_USER_INPUT // user has highest priority.
+ ).indexOf(nameSource);
+ return (index < 0) ? 0 : index;
}
/**
* Set display name by simInfo index with name source
* @param displayName the display name of SIM card
* @param subId the unique SubInfoRecord index in database
- * @param nameSource 0: NAME_SOURCE_DEFAULT_SOURCE, 1: NAME_SOURCE_SIM_SOURCE,
- * 2: NAME_SOURCE_USER_INPUT, 3: NAME_SOURCE_CARRIER
+ * @param nameSource SIM display name source
* @return the number of records updated
*/
@Override
- public int setDisplayNameUsingSrc(String displayName, int subId, int nameSource) {
+ public int setDisplayNameUsingSrc(String displayName, int subId,
+ @SimDisplayNameSource int nameSource) {
if (DBG) {
logd("[setDisplayName]+ displayName:" + displayName + " subId:" + subId
+ " nameSource:" + nameSource);
@@ -1548,6 +1546,10 @@
&& (getNameSourcePriority(subInfo.getNameSource())
> getNameSourcePriority(nameSource)
|| (displayName != null && displayName.equals(subInfo.getDisplayName())))) {
+ logd("Name source " + subInfo.getNameSource() + "'s priority "
+ + getNameSourcePriority(subInfo.getNameSource()) + " is greater than "
+ + "name source " + nameSource + "'s priority "
+ + getNameSourcePriority(nameSource) + ", return now.");
return 0;
}
}
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index 84541e0e..658ba6e 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -417,7 +417,8 @@
return getCurrentState() == mDisconnectingState;
}
- boolean isActive() {
+ @VisibleForTesting
+ public boolean isActive() {
return getCurrentState() == mActiveState;
}
@@ -2090,7 +2091,7 @@
mDisabledApnTypeBitMask |= getDisallowedApnTypes();
- mNetworkAgent = DcNetworkAgent.createDcNetworkAgent(DataConnection.this,
+ mNetworkAgent = new DcNetworkAgent(DataConnection.this,
mPhone, mNetworkInfo, mScore, misc, factorySerialNumber, mTransportType);
}
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java b/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
index ed5ad1b..87152f2 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
@@ -39,7 +39,6 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* This class represents a network agent which is communication channel between
@@ -66,23 +65,20 @@
private final LocalLog mNetCapsLocalLog = new LocalLog(50);
- private static AtomicInteger sSerialNumber = new AtomicInteger(0);
-
private NetworkInfo mNetworkInfo;
- private DcNetworkAgent(DataConnection dc, String tag, Phone phone, NetworkInfo ni,
- int score, NetworkMisc misc, int factorySerialNumber,
- int transportType) {
- super(dc.getHandler().getLooper(), phone.getContext(), tag, ni,
+ DcNetworkAgent(DataConnection dc, Phone phone, NetworkInfo ni, int score, NetworkMisc misc,
+ int factorySerialNumber, int transportType) {
+ super(dc.getHandler().getLooper(), phone.getContext(), "DcNetworkAgent", ni,
dc.getNetworkCapabilities(), dc.getLinkProperties(), score, misc,
factorySerialNumber);
- mTag = tag;
+ mTag = "DcNetworkAgent" + "-" + netId;
mPhone = phone;
mNetworkCapabilities = dc.getNetworkCapabilities();
mTransportType = transportType;
mDataConnection = dc;
mNetworkInfo = ni;
- logd(tag + " created for data connection " + dc.getName());
+ logd(mTag + " created for data connection " + dc.getName());
}
/**
@@ -93,28 +89,6 @@
}
/**
- * Constructor
- *
- * @param dc The data connection owns this network agent.
- * @param phone The phone object.
- * @param ni Network info.
- * @param score Score of the data connection.
- * @param misc The miscellaneous information of the data connection.
- * @param factorySerialNumber Serial number of telephony network factory.
- * @param transportType The transport of the data connection.
- * @return The network agent
- */
- public static DcNetworkAgent createDcNetworkAgent(DataConnection dc, Phone phone,
- NetworkInfo ni, int score, NetworkMisc misc,
- int factorySerialNumber, int transportType) {
- // Use serial number only. Do not use transport type because it can be transferred to
- // a different transport.
- String tag = "DcNetworkAgent-" + sSerialNumber.incrementAndGet();
- return new DcNetworkAgent(dc, tag, phone, ni, score, misc, factorySerialNumber,
- transportType);
- }
-
- /**
* Set the data connection that owns this network agent.
*
* @param dc Data connection owning this network agent.
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index dc1c417..8acd9de 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -108,7 +108,7 @@
import com.android.internal.telephony.metrics.TelephonyMetrics;
import com.android.internal.telephony.uicc.IccRecords;
import com.android.internal.telephony.uicc.UiccController;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import com.android.internal.util.AsyncChannel;
import java.io.FileDescriptor;
diff --git a/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java b/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java
index f391320..7f0c730 100644
--- a/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java
+++ b/src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java
@@ -347,16 +347,16 @@
if (dcTracker != null) {
DataConnection dc = dcTracker.getDataConnectionByApnType(
ApnSetting.getApnTypeString(apnType));
- if (dc != null && (dc.isActive() || dc.isActivating())) {
+ if (dc != null && (dc.isActive())) {
Message onCompleteMsg = mInternalHandler.obtainMessage(
EVENT_DATA_HANDOVER_COMPLETED);
onCompleteMsg.getData().putParcelable(
DcTracker.DATA_COMPLETE_MSG_EXTRA_NETWORK_REQUEST, networkRequest);
mPendingHandovers.put(onCompleteMsg, handoverParams);
- // TODO: Need to handle the case that the request is there, but there is no
- // actual data connections established.
requestNetworkInternal(networkRequest, DcTracker.REQUEST_TYPE_HANDOVER,
targetTransport, onCompleteMsg);
+ log("Requested handover " + ApnSetting.getApnTypeString(apnType) + " to "
+ + AccessNetworkConstants.transportTypeToString(targetTransport));
handoverPending = true;
} else {
// Request is there, but no actual data connection. In this case, just move
diff --git a/src/java/com/android/internal/telephony/dataconnection/TransportManager.java b/src/java/com/android/internal/telephony/dataconnection/TransportManager.java
index c61bbe2..6a2af7c 100644
--- a/src/java/com/android/internal/telephony/dataconnection/TransportManager.java
+++ b/src/java/com/android/internal/telephony/dataconnection/TransportManager.java
@@ -38,7 +38,7 @@
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.RIL;
import com.android.internal.telephony.dataconnection.AccessNetworksManager.QualifiedNetworks;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import com.android.internal.util.IndentingPrintWriter;
import java.io.FileDescriptor;
diff --git a/src/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java b/src/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java
index 7b5dd0c..c258a81 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java
@@ -130,7 +130,7 @@
if (sEnableCbModule) {
mCellBroadcastServiceManager.sendGsmMessageToHandler(m);
} else {
- m.setWhat(GsmCellBroadcastHandler.EVENT_NEW_SMS_MESSAGE);
+ m.what = GsmCellBroadcastHandler.EVENT_NEW_SMS_MESSAGE;
mCellBroadcastHandler.sendMessage(m);
}
}
diff --git a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
index 01ba6ad..b3c071b 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
@@ -53,7 +53,7 @@
import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
import com.android.internal.telephony.uicc.IccRecords;
import com.android.internal.telephony.uicc.UiccCardApplication;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import dalvik.annotation.compat.UnsupportedAppUsage;
diff --git a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
index db19bc9..4bf0d10 100644
--- a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
+++ b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
@@ -903,31 +903,20 @@
ssProto.dataRoamingType = serviceState.getDataRoamingType();
ssProto.voiceOperator = new TelephonyServiceState.TelephonyOperator();
-
- if (serviceState.getVoiceOperatorAlphaLong() != null) {
- ssProto.voiceOperator.alphaLong = serviceState.getVoiceOperatorAlphaLong();
- }
-
- if (serviceState.getVoiceOperatorAlphaShort() != null) {
- ssProto.voiceOperator.alphaShort = serviceState.getVoiceOperatorAlphaShort();
- }
-
- if (serviceState.getVoiceOperatorNumeric() != null) {
- ssProto.voiceOperator.numeric = serviceState.getVoiceOperatorNumeric();
- }
-
ssProto.dataOperator = new TelephonyServiceState.TelephonyOperator();
-
- if (serviceState.getDataOperatorAlphaLong() != null) {
- ssProto.dataOperator.alphaLong = serviceState.getDataOperatorAlphaLong();
+ if (serviceState.getOperatorAlphaLong() != null) {
+ ssProto.voiceOperator.alphaLong = serviceState.getOperatorAlphaLong();
+ ssProto.dataOperator.alphaLong = serviceState.getOperatorAlphaLong();
}
- if (serviceState.getDataOperatorAlphaShort() != null) {
- ssProto.dataOperator.alphaShort = serviceState.getDataOperatorAlphaShort();
+ if (serviceState.getOperatorAlphaShort() != null) {
+ ssProto.voiceOperator.alphaShort = serviceState.getOperatorAlphaShort();
+ ssProto.dataOperator.alphaShort = serviceState.getOperatorAlphaShort();
}
- if (serviceState.getDataOperatorNumeric() != null) {
- ssProto.dataOperator.numeric = serviceState.getDataOperatorNumeric();
+ if (serviceState.getOperatorNumeric() != null) {
+ ssProto.voiceOperator.numeric = serviceState.getOperatorNumeric();
+ ssProto.dataOperator.numeric = serviceState.getOperatorNumeric();
}
ssProto.voiceRat = serviceState.getRilVoiceRadioTechnology();
diff --git a/src/java/com/android/internal/telephony/uicc/IccRecords.java b/src/java/com/android/internal/telephony/uicc/IccRecords.java
index 0307363..c305263 100644
--- a/src/java/com/android/internal/telephony/uicc/IccRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/IccRecords.java
@@ -33,7 +33,7 @@
import com.android.internal.telephony.CommandsInterface;
import com.android.internal.telephony.MccTable;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
import java.io.FileDescriptor;
import java.io.PrintWriter;
diff --git a/src/java/com/android/internal/telephony/uicc/UiccProfile.java b/src/java/com/android/internal/telephony/uicc/UiccProfile.java
index d5a2f94..376977e 100644
--- a/src/java/com/android/internal/telephony/uicc/UiccProfile.java
+++ b/src/java/com/android/internal/telephony/uicc/UiccProfile.java
@@ -372,8 +372,8 @@
String ccName = config.getString(CarrierConfigManager.KEY_CARRIER_NAME_STRING);
String newCarrierName = null;
- String currSpn = getServiceProviderName();
- int nameSource = SubscriptionManager.NAME_SOURCE_SIM_SOURCE;
+ String currSpn = getServiceProviderName(); // Get the name from EF_SPN.
+ int nameSource = SubscriptionManager.NAME_SOURCE_SIM_SPN;
// If carrier config is priority, use it regardless - the preference
// and the name were both set by the carrier, so this is safe;
// otherwise, if the SPN is priority but we don't have one *and* we have
@@ -382,10 +382,18 @@
newCarrierName = ccName;
nameSource = SubscriptionManager.NAME_SOURCE_CARRIER;
} else if (TextUtils.isEmpty(currSpn)) {
- // currSpn is empty and could not get name from carrier config; get name from carrier id
+ // currSpn is empty and could not get name from carrier config; get name from PNN or
+ // carrier id
Phone phone = PhoneFactory.getPhone(mPhoneId);
if (phone != null) {
- newCarrierName = phone.getCarrierName();
+ String currPnn = phone.getPlmn(); // Get the name from EF_PNN.
+ if (!TextUtils.isEmpty(currPnn)) {
+ newCarrierName = currPnn;
+ nameSource = SubscriptionManager.NAME_SOURCE_SIM_PNN;
+ } else {
+ newCarrierName = phone.getCarrierName(); // Get the name from carrier id.
+ nameSource = SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE;
+ }
}
}
diff --git a/src/java/com/android/internal/telephony/util/TelephonyUtils.java b/src/java/com/android/internal/telephony/util/TelephonyUtils.java
index 518aece..0105577 100644
--- a/src/java/com/android/internal/telephony/util/TelephonyUtils.java
+++ b/src/java/com/android/internal/telephony/util/TelephonyUtils.java
@@ -17,25 +17,44 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.content.Context;
import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.os.Binder;
import android.os.RemoteException;
import android.os.SystemProperties;
+import java.io.PrintWriter;
+
/**
* This class provides various util functions
*/
public final class TelephonyUtils {
public static boolean IS_USER = "user".equals(android.os.Build.TYPE);
+ /**
+ * Verify that caller holds {@link android.Manifest.permission#DUMP}.
+ *
+ * @return true if access should be granted.
+ */
+ public static boolean checkDumpPermission(Context context, String tag, PrintWriter pw) {
+ if (context.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)
+ != PackageManager.PERMISSION_GRANTED) {
+ pw.println("Permission Denial: can't dump " + tag + " from from pid="
+ + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()
+ + " due to missing android.permission.DUMP permission");
+ return false;
+ } else {
+ return true;
+ }
+ }
+
/** {@hide} */
public static String emptyIfNull(@Nullable String str) {
return str == null ? "" : str;
}
- public static boolean IS_DEBUGGABLE =
- SystemProperties.getInt("ro.debuggable", 0) == 1;
-
/** {@hide} */
public static RuntimeException rethrowAsRuntimeException(RemoteException remoteException) {
throw new RuntimeException(remoteException);
@@ -47,4 +66,7 @@
if (resolveInfo.providerInfo != null) return resolveInfo.providerInfo;
throw new IllegalStateException("Missing ComponentInfo!");
}
- }
+
+ public static boolean IS_DEBUGGABLE =
+ SystemProperties.getInt("ro.debuggable", 0) == 1;
+}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
index 60494a8..2d47062 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
@@ -200,19 +200,13 @@
public void testOperatorName() {
ServiceState ss = new ServiceState();
- ss.setDataOperatorAlphaLong("abc");
- assertEquals("abc", ss.getDataOperatorAlphaLong());
-
- ss.setDataOperatorName("def", "xyz", "123456");
- assertEquals("xyz", ss.getDataOperatorAlphaShort());
+ ss.setOperatorAlphaLong("abc");
+ assertEquals("abc", ss.getOperatorAlphaLong());
ss.setOperatorName("long", "short", "numeric");
- assertEquals("long", ss.getVoiceOperatorAlphaLong());
- assertEquals("short", ss.getVoiceOperatorAlphaShort());
- assertEquals("numeric", ss.getVoiceOperatorNumeric());
- assertEquals("long", ss.getDataOperatorAlphaLong());
- assertEquals("short", ss.getDataOperatorAlphaShort());
- assertEquals("numeric", ss.getDataOperatorNumeric());
+ assertEquals("long", ss.getOperatorAlphaLong());
+ assertEquals("short", ss.getOperatorAlphaShort());
+ assertEquals("numeric", ss.getOperatorNumeric());
assertEquals("long", ss.getOperatorAlpha());
ss.setOperatorName("", "short", "");
diff --git a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
index 75b3534..609b028 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
@@ -202,7 +202,7 @@
/* Setting */
String disName = "TESTING";
- int nameSource = SubscriptionManager.NAME_SOURCE_SIM_SOURCE;
+ int nameSource = SubscriptionManager.NAME_SOURCE_SIM_SPN;
mSubscriptionControllerUT.setDisplayNameUsingSrc(disName, subID, nameSource);
SubscriptionInfo subInfo = mSubscriptionControllerUT
.getActiveSubscriptionInfo(subID, mCallingPackage);
@@ -465,12 +465,12 @@
// Changing non-opportunistic sub1 shouldn't trigger callback.
mSubscriptionControllerUT.setDisplayNameUsingSrc("DisplayName", 1,
- SubscriptionManager.NAME_SOURCE_SIM_SOURCE);
+ SubscriptionManager.NAME_SOURCE_SIM_SPN);
verify(mTelephonyRegisteryMock, times(1))
.notifyOpportunisticSubscriptionInfoChanged();
mSubscriptionControllerUT.setDisplayNameUsingSrc("DisplayName", 2,
- SubscriptionManager.NAME_SOURCE_SIM_SOURCE);
+ SubscriptionManager.NAME_SOURCE_SIM_SPN);
verify(mTelephonyRegisteryMock, times(2))
.notifyOpportunisticSubscriptionInfoChanged();
}
@@ -1004,4 +1004,28 @@
mSubscriptionControllerUT.setAlwaysAllowMmsData(0, false);
verify(mDataEnabledSettings).setAlwaysAllowMmsData(eq(false));
}
+
+ @Test
+ @SmallTest
+ public void testNameSourcePriority() throws Exception {
+ assertTrue(mSubscriptionControllerUT.getNameSourcePriority(
+ SubscriptionManager.NAME_SOURCE_USER_INPUT)
+ > mSubscriptionControllerUT.getNameSourcePriority(
+ SubscriptionManager.NAME_SOURCE_CARRIER));
+
+ assertTrue(mSubscriptionControllerUT.getNameSourcePriority(
+ SubscriptionManager.NAME_SOURCE_CARRIER)
+ > mSubscriptionControllerUT.getNameSourcePriority(
+ SubscriptionManager.NAME_SOURCE_SIM_SPN));
+
+ assertTrue(mSubscriptionControllerUT.getNameSourcePriority(
+ SubscriptionManager.NAME_SOURCE_SIM_SPN)
+ > mSubscriptionControllerUT.getNameSourcePriority(
+ SubscriptionManager.NAME_SOURCE_SIM_PNN));
+
+ assertTrue(mSubscriptionControllerUT.getNameSourcePriority(
+ SubscriptionManager.NAME_SOURCE_SIM_PNN)
+ > mSubscriptionControllerUT.getNameSourcePriority(
+ SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE));
+ }
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java
index 9250942..ad6e7ec 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java
@@ -29,6 +29,7 @@
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import android.net.NetworkCapabilities;
@@ -57,6 +58,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.Mockito;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -72,6 +74,9 @@
@Mock
private RadioConfig mMockRadioConfig;
+ @Mock
+ private DataConnection mDataConnection;
+
private String mTestName = "";
private final ArrayList<NetworkRequest> mNetworkRequestList = new ArrayList<>();
@@ -346,4 +351,41 @@
h.sendMessage(h.obtainMessage(5, ar));
processAllMessages();
}
+
+ /**
+ * Test handover when the data connection is being connected.
+ */
+ @Test
+ @SmallTest
+ public void testHandoverActivatingData() throws Exception {
+ createMockedTelephonyComponents();
+ doReturn(0).when(mSubscriptionController).getSubIdUsingPhoneId(0);
+ mTelephonyNetworkFactoryUT.mInternalHandler.sendEmptyMessage(
+ TelephonyNetworkFactory.EVENT_SUBSCRIPTION_CHANGED);
+
+ activatePhoneInPhoneSwitcher(0, true);
+ makeDefaultInternetRequest();
+
+ makeSubSpecificMmsRequest(0);
+ processAllMessages();
+
+ Field f = TelephonyNetworkFactory.class.getDeclaredField("mInternalHandler");
+ f.setAccessible(true);
+ Handler h = (Handler) f.get(mTelephonyNetworkFactoryUT);
+
+ HandoverCallback handoverCallback = mock(HandoverCallback.class);
+ Mockito.reset(mDcTracker);
+ doReturn(mDataConnection).when(mDcTracker).getDataConnectionByApnType(anyString());
+ doReturn(false).when(mDataConnection).isActive();
+
+ HandoverParams hp = new HandoverParams(ApnSetting.TYPE_MMS,
+ AccessNetworkConstants.TRANSPORT_TYPE_WLAN, handoverCallback);
+ AsyncResult ar = new AsyncResult(null, hp, null);
+ h.sendMessage(h.obtainMessage(5, ar));
+ processAllMessages();
+
+ verify(mDcTracker, times(1)).releaseNetwork(any(), eq(1));
+ verify(mDcTracker, times(1)).requestNetwork(any(), eq(1), any());
+ }
+
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java b/tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java
index 571f4ee..30e1297 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java
@@ -113,12 +113,9 @@
doReturn(ROAMING_TYPE_DOMESTIC).when(mServiceState).getVoiceRoamingType();
doReturn(ROAMING_TYPE_DOMESTIC).when(mServiceState).getDataRoamingType();
- doReturn("voiceshort").when(mServiceState).getVoiceOperatorAlphaShort();
- doReturn("voicelong").when(mServiceState).getVoiceOperatorAlphaLong();
- doReturn("datashort").when(mServiceState).getDataOperatorAlphaShort();
- doReturn("datalong").when(mServiceState).getDataOperatorAlphaLong();
- doReturn("123456").when(mServiceState).getVoiceOperatorNumeric();
- doReturn("123456").when(mServiceState).getDataOperatorNumeric();
+ doReturn("short").when(mServiceState).getOperatorAlphaShort();
+ doReturn("long").when(mServiceState).getOperatorAlphaLong();
+ doReturn("123456").when(mServiceState).getOperatorNumeric();
doReturn(RIL_RADIO_TECHNOLOGY_LTE).when(mServiceState).getRilVoiceRadioTechnology();
doReturn(RIL_RADIO_TECHNOLOGY_LTE).when(mServiceState).getRilDataRadioTechnology();
doReturn(FREQUENCY_RANGE_UNKNOWN).when(mServiceState).getNrFrequencyRange();
@@ -708,15 +705,15 @@
assertEquals(RoamingType.ROAMING_TYPE_DOMESTIC, state.dataRoamingType);
- assertEquals("voicelong", state.voiceOperator.alphaLong);
+ assertEquals("long", state.voiceOperator.alphaLong);
- assertEquals("voiceshort", state.voiceOperator.alphaShort);
+ assertEquals("short", state.voiceOperator.alphaShort);
assertEquals("123456", state.voiceOperator.numeric);
- assertEquals("datalong", state.dataOperator.alphaLong);
+ assertEquals("long", state.dataOperator.alphaLong);
- assertEquals("datashort", state.dataOperator.alphaShort);
+ assertEquals("short", state.dataOperator.alphaShort);
assertEquals("123456", state.dataOperator.numeric);
@@ -756,15 +753,15 @@
assertEquals(RoamingType.ROAMING_TYPE_DOMESTIC, state.dataRoamingType);
- assertEquals("voicelong", state.voiceOperator.alphaLong);
+ assertEquals("long", state.voiceOperator.alphaLong);
- assertEquals("voiceshort", state.voiceOperator.alphaShort);
+ assertEquals("short", state.voiceOperator.alphaShort);
assertEquals("123456", state.voiceOperator.numeric);
- assertEquals("datalong", state.dataOperator.alphaLong);
+ assertEquals("long", state.dataOperator.alphaLong);
- assertEquals("datashort", state.dataOperator.alphaShort);
+ assertEquals("short", state.dataOperator.alphaShort);
assertEquals("123456", state.dataOperator.numeric);
}