diff options
author | Wink Saville <wink@google.com> | 2013-08-08 22:06:21 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-08 22:06:21 +0000 |
commit | 35152f13b3302dbcb43345458dd5b8b092e37320 (patch) | |
tree | 6f33bcf85e5d24ae18fa10a9f075d223bc329fc9 /services | |
parent | 5191b8599011c255936e3a3cacc052c03e57b772 (diff) | |
parent | 42d4f08db2c15e1829c1fc5d1942cf029ab0895b (diff) | |
download | frameworks_base-35152f13b3302dbcb43345458dd5b8b092e37320.zip frameworks_base-35152f13b3302dbcb43345458dd5b8b092e37320.tar.gz frameworks_base-35152f13b3302dbcb43345458dd5b8b092e37320.tar.bz2 |
Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index caab49e..68037e0 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -4103,7 +4103,9 @@ public class ConnectivityService extends IConnectivityManager.Stub { return null; } - private String getMobileRedirectedProvisioningUrl() { + @Override + public String getMobileRedirectedProvisioningUrl() { + enforceConnectivityInternalPermission(); String url = getProvisioningUrlBaseFromFile(REDIRECTED_PROVISIONING); if (TextUtils.isEmpty(url)) { url = mContext.getResources().getString(R.string.mobile_redirected_provisioning_url); @@ -4111,14 +4113,15 @@ public class ConnectivityService extends IConnectivityManager.Stub { return url; } + @Override public String getMobileProvisioningUrl() { enforceConnectivityInternalPermission(); String url = getProvisioningUrlBaseFromFile(PROVISIONING); if (TextUtils.isEmpty(url)) { url = mContext.getResources().getString(R.string.mobile_provisioning_url); - log("getProvisioningUrl: mobile_provisioining_url from resource =" + url); + log("getMobileProvisioningUrl: mobile_provisioining_url from resource =" + url); } else { - log("getProvisioningUrl: mobile_provisioning_url from File =" + url); + log("getMobileProvisioningUrl: mobile_provisioning_url from File =" + url); } // populate the iccid, imei and phone number in the provisioning url. if (!TextUtils.isEmpty(url)) { |