LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am a0ffa2ed: am 55adb390: am 6db564f6: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev am: 0d406dffc0

Browse Source 
Original change: undetermined

Change-Id: Id8262b90c7a05301e78334ae42badbcabe16edb0
This commit is contained in:
Wink Saville
2021-05-31 06:29:14 +00:00
committed by Automerger Merge Worker
parent b6d08bb2f2 0d406dffc0
commit 7e079f1cde
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

@@ -1401,7 +1401,7 @@ public class ConnectivityManager {
}
/**
* Get the carrier provisioning url.
* Get the mobile provisioning url.
* {@hide}
*/
public String getMobileProvisioningUrl() {
@@ -1411,4 +1411,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

@@ -141,4 +141,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

@@ -4287,7 +4287,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);
@@ -4295,14 +4297,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)) {