diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-09-15 15:59:36 -0400 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2014-09-29 11:37:43 +0000 |
| commit | 89e0f0937a70d73b5ed188c9337b4d33860e5573 (patch) | |
| tree | 9684eecef40851496c4bd5be61cc994f99c8241d /core/java | |
| parent | 208678718f9f8db3bc279c7d5bd1445af2831ae3 (diff) | |
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
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/net/IConnectivityManager.aidl | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index e3cbef5a1182..2e24785918c6 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -1970,9 +1970,9 @@ public class ConnectivityManager { * {@hide} */ public void setProvisioningNotificationVisible(boolean visible, int networkType, - String extraInfo, String url) { + String action) { try { - mService.setProvisioningNotificationVisible(visible, networkType, extraInfo, url); + mService.setProvisioningNotificationVisible(visible, networkType, action); } catch (RemoteException e) { } } diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 974c4cd0bcf1..a983d88226c8 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -139,8 +139,7 @@ interface IConnectivityManager LinkQualityInfo[] getAllLinkQualityInfo(); - void setProvisioningNotificationVisible(boolean visible, int networkType, in String extraInfo, - in String url); + void setProvisioningNotificationVisible(boolean visible, int networkType, in String action); void setAirplaneMode(boolean enable); |