joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

am 55adb390: am 848b190c: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev

Browse source 
* commit '55adb390bb96175db9abee3ead349a98b4dc4262':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
This commit is contained in:
Wink Saville 2013-08-08 15:46:52 -07:00 • committed by Android Git Automerger
commit b3aae5de90
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/java/android/net/ConnectivityManager.java
View file

@ -1360,7 +1360,7 @@ public class ConnectivityManager {
}
/**
* Get the carrier provisioning url.
* Get the mobile provisioning url.
* {@hide}
*/
public String getMobileProvisioningUrl() {
@ -1370,4 +1370,16 @@ public class ConnectivityManager {
}
return null;
}
/**
* Get the mobile redirected provisioning url.
* {@hide}
*/
public String getMobileRedirectedProvisioningUrl() {
try {
return mService.getMobileRedirectedProvisioningUrl();
} catch (RemoteException e) {
}
return null;
}
}

2
core/java/android/net/IConnectivityManager.aidl
View file

@ -136,4 +136,6 @@ interface IConnectivityManager
int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs, in ResultReceiver resultReceiver);
String getMobileProvisioningUrl();
String getMobileRedirectedProvisioningUrl();
}

9
services/java/com/android/server/ConnectivityService.java
View file

@ -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)) {