Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89e0f093 authored by Paul Jensen's avatar Paul Jensen
Browse files

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
parent 20867871

core/java/android/net/ConnectivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {

        }

    }

core/java/android/net/IConnectivityManager.aidl

+1 −2
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/ConnectivityService.java

+14 −738

File changed.

Preview size limit exceeded, changes collapsed.