aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiangyu/Malcolm Chen <refuhoo@google.com>2018-11-27 05:32:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-11-27 05:32:00 +0000
commit710d926f3a1732cb589608abaaaad59d3a5bf406 (patch)
tree1ae685c424ef310043ad72dd5e17d37566b68f32
parenta0e9db2d3f2beade2a19bb22a3dc4da71647d282 (diff)
parent71b4530d8469ff57c95e5c19daf58867a97123a9 (diff)
downloadandroid_frameworks_opt_telephony-710d926f3a1732cb589608abaaaad59d3a5bf406.tar.gz
android_frameworks_opt_telephony-710d926f3a1732cb589608abaaaad59d3a5bf406.tar.bz2
android_frameworks_opt_telephony-710d926f3a1732cb589608abaaaad59d3a5bf406.zip
Merge "Change default value of preferredSubId from INVLAID to DEFAULT."
-rw-r--r--src/java/com/android/internal/telephony/PhoneSwitcher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/PhoneSwitcher.java b/src/java/com/android/internal/telephony/PhoneSwitcher.java
index a54e653b6..75dd049f1 100644
--- a/src/java/com/android/internal/telephony/PhoneSwitcher.java
+++ b/src/java/com/android/internal/telephony/PhoneSwitcher.java
@@ -86,9 +86,9 @@ public class PhoneSwitcher extends Handler {
// If mPreferredDataSubId is an active subscription, it overrides
// mDefaultDataSubId and decides:
// 1. In modem layer, which subscription is preferred to have data traffic on.
- // 2. In TelephonyNetworkFactory, which subscription will apply default network requets, which
+ // 2. In TelephonyNetworkFactory, which subscription will apply default network requests, which
// are requests without specifying a subId.
- private int mPreferredDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ private int mPreferredDataSubId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
@VisibleForTesting
// Corresponding phoneId after considerting mPreferredDataSubId and mDefaultDataSubId above.