Skip to content

Commit 89e0f09

Browse files
committed
Move mobile provisioning APN support into telephony.
Most of this logic is simply removed from ConnectivityService. The captive portal detection is now done by the NetworkMonitor. The notification logic is still left in ConnectivityService as it's used by both the NetworkMonitor and telephony's mobile provisioning logic. bug:17324098 Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
1 parent 2086787 commit 89e0f09

3 files changed

Lines changed: 17 additions & 742 deletions

File tree

core/java/android/net/ConnectivityManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,9 +1970,9 @@ public LinkQualityInfo[] getAllLinkQualityInfo() {
19701970
* {@hide}
19711971
*/
19721972
public void setProvisioningNotificationVisible(boolean visible, int networkType,
1973-
String extraInfo, String url) {
1973+
String action) {
19741974
try {
1975-
mService.setProvisioningNotificationVisible(visible, networkType, extraInfo, url);
1975+
mService.setProvisioningNotificationVisible(visible, networkType, action);
19761976
} catch (RemoteException e) {
19771977
}
19781978
}

core/java/android/net/IConnectivityManager.aidl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ interface IConnectivityManager
139139

140140
LinkQualityInfo[] getAllLinkQualityInfo();
141141

142-
void setProvisioningNotificationVisible(boolean visible, int networkType, in String extraInfo,
143-
in String url);
142+
void setProvisioningNotificationVisible(boolean visible, int networkType, in String action);
144143

145144
void setAirplaneMode(boolean enable);
146145

0 commit comments

Comments
 (0)