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

Commit 009d4a86 authored by Erik Kline's avatar Erik Kline Committed by Android Partner Code Review
Browse files

Merge "Final removal of CONNECTIVITY_ACTION_IMMEDIATE." into m-wireless-dev

parents db1dbb88 2625befb

core/java/android/net/ConnectivityManager.java

+0 −10
Original line number Diff line number Diff line
@@ -99,16 +99,6 @@ public class ConnectivityManager { 
    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";



    /**

     * Identical to {@link #CONNECTIVITY_ACTION} broadcast, but sent without any

     * historic {@link Settings.Global#CONNECTIVITY_CHANGE_DELAY}.

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String CONNECTIVITY_ACTION_IMMEDIATE =

            "android.net.conn.CONNECTIVITY_CHANGE_IMMEDIATE";



    /**

     * The device has connected to a network that has presented a captive

     * portal, which is blocking Internet connectivity. The user was presented

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 


    <protected-broadcast android:name="android.net.conn.CAPTIVE_PORTAL" />

    <protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE" />

    <!-- @deprecated.  Only {@link android.net.ConnectivityManager.CONNECTIVITY_ACTION} is sent. -->

    <protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE_IMMEDIATE" />

    <protected-broadcast android:name="android.net.conn.DATA_ACTIVITY_CHANGE" />

    <protected-broadcast android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />

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

+0 −5
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server; 
import static android.Manifest.permission.MANAGE_NETWORK_POLICY;

import static android.Manifest.permission.RECEIVE_DATA_ACTIVITY_CHANGE;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE;

import static android.net.ConnectivityManager.NETID_UNSET;

import static android.net.ConnectivityManager.TYPE_NONE;

import static android.net.ConnectivityManager.TYPE_VPN;
@@ -1368,7 +1367,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    public void sendConnectedBroadcast(NetworkInfo info) {

        enforceConnectivityInternalPermission();

        sendGeneralBroadcast(info, CONNECTIVITY_ACTION_IMMEDIATE);

        sendGeneralBroadcast(info, CONNECTIVITY_ACTION);

    }
@@ -4203,9 +4201,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            }

            intent.putExtra(ConnectivityManager.EXTRA_INET_CONDITION,

                    mDefaultInetConditionPublished);

            final Intent immediateIntent = new Intent(intent);

            immediateIntent.setAction(CONNECTIVITY_ACTION_IMMEDIATE);

            sendStickyBroadcast(immediateIntent);

            sendStickyBroadcast(intent);

            if (newDefaultAgent != null) {

                sendConnectedBroadcast(newDefaultAgent.networkInfo);