diff options
| author | Robert Greenwalt <robdroid@android.com> | 2012-04-20 14:20:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-20 14:20:42 -0700 |
| commit | cd74a180ce2bb5d5bf4e274168b35f2143b32f72 (patch) | |
| tree | a09e5a7129b441f185512e84800cf1a8ed68ed18 | |
| parent | 509e23e8a4ee6ecf53b1a85badd3586f6a98d18c (diff) | |
| parent | 53eb13ce0a05426ceed03465ed37f7f3587eb4f4 (diff) | |
| download | frameworks_base-cd74a180ce2bb5d5bf4e274168b35f2143b32f72.zip frameworks_base-cd74a180ce2bb5d5bf4e274168b35f2143b32f72.tar.gz frameworks_base-cd74a180ce2bb5d5bf4e274168b35f2143b32f72.tar.bz2 | |
Merge "Set AuthType to NONE if username of APN is not set"
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java index fec0158..df3278b 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java @@ -91,8 +91,8 @@ public class GsmDataConnection extends DataConnection { int authType = mApn.authType; if (authType == -1) { - authType = (mApn.user != null) ? RILConstants.SETUP_DATA_AUTH_PAP_CHAP : - RILConstants.SETUP_DATA_AUTH_NONE; + authType = TextUtils.isEmpty(mApn.user) ? RILConstants.SETUP_DATA_AUTH_NONE + : RILConstants.SETUP_DATA_AUTH_PAP_CHAP; } String protocol; |