diff options
author | bolian@chromium.org <bolian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 05:10:03 +0000 |
---|---|---|
committer | bolian@chromium.org <bolian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 05:10:03 +0000 |
commit | 74d9c5245d657e577a9060db156444952f9b96c7 (patch) | |
tree | 654633cf9bbe241f54e3f8b3000398bed7316222 /net/android/network_library.cc | |
parent | dfb4832e310bbd581d7d8ac2e8ce798e1faf3ef5 (diff) | |
download | chromium_src-74d9c5245d657e577a9060db156444952f9b96c7.zip chromium_src-74d9c5245d657e577a9060db156444952f9b96c7.tar.gz chromium_src-74d9c5245d657e577a9060db156444952f9b96c7.tar.bz2 |
Move android Telephony APIs from content/ to net/.
This is needed for logging operator code in net/. See
https://codereview.chromium.org/246553003/
BUG=355604
Review URL: https://codereview.chromium.org/254823005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android/network_library.cc')
-rw-r--r-- | net/android/network_library.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/net/android/network_library.cc b/net/android/network_library.cc index ea9ec4a4..c3a42f7 100644 --- a/net/android/network_library.cc +++ b/net/android/network_library.cc @@ -122,6 +122,20 @@ bool GetMimeTypeFromExtension(const std::string& extension, return true; } +std::string GetTelephonyNetworkCountryIso() { + return base::android::ConvertJavaStringToUTF8( + Java_AndroidNetworkLibrary_getNetworkCountryIso( + base::android::AttachCurrentThread(), + base::android::GetApplicationContext())); +} + +std::string GetTelephonyNetworkOperator() { + return base::android::ConvertJavaStringToUTF8( + Java_AndroidNetworkLibrary_getNetworkOperator( + base::android::AttachCurrentThread(), + base::android::GetApplicationContext())); +} + bool RegisterNetworkLibrary(JNIEnv* env) { return RegisterNativesImpl(env); } |