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

Commit 40f09de8 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f901... 

Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f901 am: 0e37e301 am: 7a35f4b4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0d0d57bc74aaf9590dcdd4aa76919da8ccb7d0
parents 3c649ed6 7a35f4b4

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.IntentFilter; 
import android.net.ConnectivityManager;

import android.net.NetworkInfo;

import android.net.NetworkInfo.State;

import android.net.TetheringManager;

import android.net.wifi.ScanResult;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiManager;
@@ -141,7 +142,7 @@ public class ConnectivityManagerTestBase extends InstrumentationTestCase { 
        mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);

        mIntentFilter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);

        mIntentFilter.addAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);

        mIntentFilter.addAction(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);

        mIntentFilter.addAction(TetheringManager.ACTION_TETHER_STATE_CHANGED);

        mContext.registerReceiver(mWifiReceiver, mIntentFilter);



        logv("Clear Wifi before we start the test.");

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.content.Intent.ACTION_UID_REMOVED; 
import static android.content.Intent.ACTION_USER_REMOVED;

import static android.content.Intent.EXTRA_UID;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;

import static android.net.ConnectivityManager.isNetworkTypeMobile;

import static android.net.NetworkIdentity.SUBTYPE_COMBINED;

import static android.net.NetworkStack.checkNetworkStackPermission;
@@ -45,6 +44,7 @@ import static android.net.NetworkStats.UID_ALL; 
import static android.net.NetworkStatsHistory.FIELD_ALL;

import static android.net.NetworkTemplate.buildTemplateMobileWildcard;

import static android.net.NetworkTemplate.buildTemplateWifiWildcard;

import static android.net.TetheringManager.ACTION_TETHER_STATE_CHANGED;

import static android.net.TrafficStats.KB_IN_BYTES;

import static android.net.TrafficStats.MB_IN_BYTES;

import static android.net.TrafficStats.UNSUPPORTED;