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

Commit 082474a5 authored by Erik Kline's avatar Erik Kline
Browse files

CONNECTIVITY_ACTION is the new _IMMEDIATE 

Bug: 20013379
Change-Id: I3e904dc0a0ddb30c7bb8cdb24d0762052ddc59eb
parent c91bc62f

services/core/java/com/android/server/location/GpsLocationProvider.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -434,7 +434,7 @@ public class GpsLocationProvider implements LocationProviderInterface { 
                checkSmsSuplInit(intent);

                checkSmsSuplInit(intent);

            } else if (action.equals(Intents.WAP_PUSH_RECEIVED_ACTION)) {

            } else if (action.equals(Intents.WAP_PUSH_RECEIVED_ACTION)) {

                checkWapSuplInit(intent);

                checkWapSuplInit(intent);

            } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE)) {

            } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {

                // retrieve NetworkInfo result for this UID

                // retrieve NetworkInfo result for this UID

                NetworkInfo info =

                NetworkInfo info =

                        intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);

                        intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);
@@ -754,7 +754,7 @@ public class GpsLocationProvider implements LocationProviderInterface { 
        intentFilter = new IntentFilter();

        intentFilter = new IntentFilter();

        intentFilter.addAction(ALARM_WAKEUP);

        intentFilter.addAction(ALARM_WAKEUP);

        intentFilter.addAction(ALARM_TIMEOUT);

        intentFilter.addAction(ALARM_TIMEOUT);

        intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE);

        intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);

        intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);

        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);

        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);

        intentFilter.addAction(Intent.ACTION_SCREEN_ON);

        intentFilter.addAction(Intent.ACTION_SCREEN_ON);

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ import static android.content.Intent.ACTION_UID_REMOVED; 
import static android.content.Intent.ACTION_USER_ADDED;

import static android.content.Intent.ACTION_USER_ADDED;

import static android.content.Intent.ACTION_USER_REMOVED;

import static android.content.Intent.ACTION_USER_REMOVED;

import static android.content.Intent.EXTRA_UID;

import static android.content.Intent.EXTRA_UID;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.TYPE_ETHERNET;

import static android.net.ConnectivityManager.TYPE_ETHERNET;

import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.TYPE_WIFI;
@@ -400,7 +400,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        mContext.registerReceiver(mScreenReceiver, screenFilter);

        mContext.registerReceiver(mScreenReceiver, screenFilter);





        // watch for network interfaces to be claimed

        // watch for network interfaces to be claimed

        final IntentFilter connFilter = new IntentFilter(CONNECTIVITY_ACTION_IMMEDIATE);

        final IntentFilter connFilter = new IntentFilter(CONNECTIVITY_ACTION);

        mContext.registerReceiver(mConnReceiver, connFilter, CONNECTIVITY_INTERNAL, mHandler);

        mContext.registerReceiver(mConnReceiver, connFilter, CONNECTIVITY_INTERNAL, mHandler);





        // listen for package changes to update policy

        // listen for package changes to update policy

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




package com.android.server;

package com.android.server;





import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.getNetworkTypeName;

import static android.net.ConnectivityManager.getNetworkTypeName;
@@ -157,7 +157,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
//        mMobile.link.addRoute(MOBILE_ROUTE_V6);

//        mMobile.link.addRoute(MOBILE_ROUTE_V6);

//        mMobile.doReturnDefaults();

//        mMobile.doReturnDefaults();

//

//

//        nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE);

//        nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);

//        mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();

//        mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();

//        nextConnBroadcast.get();

//        nextConnBroadcast.get();

//

//
@@ -177,7 +177,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
//        mMobile.link.addRoute(MOBILE_ROUTE_V6);

//        mMobile.link.addRoute(MOBILE_ROUTE_V6);

//        mMobile.doReturnDefaults();

//        mMobile.doReturnDefaults();

//

//

//        nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE);

//        nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);

//        mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();

//        mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();

//        nextConnBroadcast.get();

//        nextConnBroadcast.get();

//

//
@@ -193,7 +193,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
//        // expect that mobile will be torn down

//        // expect that mobile will be torn down

//        doReturn(true).when(mMobile.tracker).teardown();

//        doReturn(true).when(mMobile.tracker).teardown();

//

//

//        nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE);

//        nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);

//        mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mWifi.info).sendToTarget();

//        mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mWifi.info).sendToTarget();

//        nextConnBroadcast.get();

//        nextConnBroadcast.get();

//

//
@@ -212,7 +212,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
//        mMobile.link.clear();

//        mMobile.link.clear();

//        mMobile.doReturnDefaults();

//        mMobile.doReturnDefaults();

//

//

//        nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION_IMMEDIATE);

//        nextConnBroadcast = mServiceContext.nextBroadcastIntent(CONNECTIVITY_ACTION);

//        mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();

//        mTrackerHandler.obtainMessage(EVENT_STATE_CHANGED, mMobile.info).sendToTarget();

//        nextConnBroadcast.get();

//        nextConnBroadcast.get();

//

//

services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.server; 




import static android.content.Intent.ACTION_UID_REMOVED;

import static android.content.Intent.ACTION_UID_REMOVED;

import static android.content.Intent.EXTRA_UID;

import static android.content.Intent.EXTRA_UID;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.NetworkPolicy.LIMIT_DISABLED;

import static android.net.NetworkPolicy.LIMIT_DISABLED;

import static android.net.NetworkPolicy.WARNING_DISABLED;

import static android.net.NetworkPolicy.WARNING_DISABLED;
@@ -597,7 +597,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        future = expectMeteredIfacesChanged();

        future = expectMeteredIfacesChanged();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        future.get();

        future.get();

        verifyAndReset();

        verifyAndReset();
@@ -708,7 +708,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
            future = expectMeteredIfacesChanged(TEST_IFACE);

            future = expectMeteredIfacesChanged(TEST_IFACE);





            replay();

            replay();

            mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

            mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

            future.get();

            future.get();

            verifyAndReset();

            verifyAndReset();

        }

        }

services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java

+13 −13
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.server; 




import static android.content.Intent.ACTION_UID_REMOVED;

import static android.content.Intent.ACTION_UID_REMOVED;

import static android.content.Intent.EXTRA_UID;

import static android.content.Intent.EXTRA_UID;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.TYPE_WIFI;

import static android.net.ConnectivityManager.TYPE_WIMAX;

import static android.net.ConnectivityManager.TYPE_WIMAX;
@@ -191,7 +191,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));





        // verify service has empty history for wifi

        // verify service has empty history for wifi

        assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);

        assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
@@ -245,7 +245,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));





        // verify service has empty history for wifi

        // verify service has empty history for wifi

        assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);

        assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
@@ -336,7 +336,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        verifyAndReset();

        verifyAndReset();





        // modify some number on wifi, and trigger poll event

        // modify some number on wifi, and trigger poll event
@@ -388,7 +388,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        verifyAndReset();

        verifyAndReset();





        // create some traffic on first network

        // create some traffic on first network
@@ -430,7 +430,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL));

        mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL));

        verifyAndReset();

        verifyAndReset();
@@ -476,7 +476,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        verifyAndReset();

        verifyAndReset();





        // create some traffic

        // create some traffic
@@ -545,7 +545,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        verifyAndReset();

        verifyAndReset();





        // create some traffic

        // create some traffic
@@ -579,7 +579,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL));

        mServiceContext.sendBroadcast(new Intent(ACTION_NETWORK_STATS_POLL));

        verifyAndReset();

        verifyAndReset();
@@ -616,7 +616,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        verifyAndReset();

        verifyAndReset();





        // create some traffic for two apps

        // create some traffic for two apps
@@ -682,7 +682,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        verifyAndReset();

        verifyAndReset();





        // create some initial traffic

        // create some initial traffic
@@ -747,7 +747,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        verifyAndReset();

        verifyAndReset();





        // create some tethering traffic

        // create some tethering traffic
@@ -787,7 +787,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expectNetworkStatsPoll();

        expectNetworkStatsPoll();





        replay();

        replay();

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION_IMMEDIATE));

        mServiceContext.sendBroadcast(new Intent(CONNECTIVITY_ACTION));

        verifyAndReset();

        verifyAndReset();





        // create some traffic, but only for DEV, and across 1.5 buckets

        // create some traffic, but only for DEV, and across 1.5 buckets