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

Commit ec4788f8 authored Mar 04, 2021 by Lucas Lin Committed by Automerger Merge Worker Mar 04, 2021

Merge "Use public API Network#getNetId() to get netid" am: 0292235a am: 9943270a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0c5f289b4544ef7d51c28beab196536f0f812e9

parents 4b6ffaba 9943270a

packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -386,7 +386,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi
	private final NetworkCallback mNetworkCallback = new NetworkCallback() {		private final NetworkCallback mNetworkCallback = new NetworkCallback() {
	@Override		@Override
	public void onAvailable(Network network) {		public void onAvailable(Network network) {
	if (DEBUG) Log.d(TAG, "onAvailable " + network.netId);		if (DEBUG) Log.d(TAG, "onAvailable " + network.getNetId());
	updateState();		updateState();
	fireCallbacks();		fireCallbacks();
	};		};
	@@ -395,7 +395,7 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi
	// how long the VPN connection is held on to.		// how long the VPN connection is held on to.
	@Override		@Override
	public void onLost(Network network) {		public void onLost(Network network) {
	if (DEBUG) Log.d(TAG, "onLost " + network.netId);		if (DEBUG) Log.d(TAG, "onLost " + network.getNetId());
	updateState();		updateState();
	fireCallbacks();		fireCallbacks();
	};		};

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3938,13 +3938,15 @@ public class StatsPullAtomService extends SystemService {
	ConnectivityManager.NetworkCallback {		ConnectivityManager.NetworkCallback {
	@Override		@Override
	public void onAvailable(Network network) {		public void onAvailable(Network network) {
	FrameworkStatsLog.write(FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED, network.netId,		FrameworkStatsLog.write(FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED,
			network.getNetId(),
	FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED__STATE__CONNECTED);		FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED__STATE__CONNECTED);
	}		}

	@Override		@Override
	public void onLost(Network network) {		public void onLost(Network network) {
	FrameworkStatsLog.write(FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED, network.netId,		FrameworkStatsLog.write(FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED,
			network.getNetId(),
	FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED__STATE__DISCONNECTED);		FrameworkStatsLog.CONNECTIVITY_STATE_CHANGED__STATE__DISCONNECTED);
	}		}
	}		}