commit | 3e0e3bc617c4fd0e03b88ae04a618381b20a383c | [log] [tgz] |
---|---|---|
author | Ram <ram.pl@samsung.com> | Thu Jun 26 11:03:44 2014 -0700 |
committer | Etan Cohen <etancohen@google.com> | Tue Jul 01 02:00:51 2014 +0000 |
tree | bfd1d06fc82e7449fed5291a40900961a08e82ea | |
parent | b973baca3b6d83bb29eb468edf3dffd7d7d32e64 [diff] |
MS: Adding Support for Emergency APN in Telephony Framework (base/telephony) Replacement for https://partner-android-review.googlesource.com/#/c/171175/ Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb Conflicts: core/java/android/net/ConnectivityManager.java
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 19fff55..7fe1e82 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3925,6 +3925,8 @@ usedNetworkType = ConnectivityManager.TYPE_MOBILE_IMS; } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_CBS)) { usedNetworkType = ConnectivityManager.TYPE_MOBILE_CBS; + } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_EMERGENCY)) { + usedNetworkType = ConnectivityManager.TYPE_MOBILE_EMERGENCY; } else { Slog.e(TAG, "Can't match any mobile netTracker!"); }