LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Move network activity change processing to handler thread" am: df9a2d7e20

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606673

Change-Id: I9d84525d3dfe33c45f13b1caa436baa8232942cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi
2023-06-20 01:26:11 +00:00
committed by Automerger Merge Worker
parent d41a3fc42d df9a2d7e20
commit b3f309ca24
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
service/src/com/android/server/ConnectivityService.java
View File

@@ -1703,7 +1703,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mUserAllContext.registerReceiver(mPackageIntentReceiver, packageIntentFilter,
null /* broadcastPermission */, mHandler);
mNetworkActivityTracker = new LegacyNetworkActivityTracker(mContext, mHandler, mNetd);
mNetworkActivityTracker = new LegacyNetworkActivityTracker(mContext, mNetd);
final NetdCallback netdCallback = new NetdCallback();
try {
@@ -5879,7 +5879,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
break;
}
case EVENT_REPORT_NETWORK_ACTIVITY:
mNetworkActivityTracker.handleReportNetworkActivity();
final NetworkActivityParams arg = (NetworkActivityParams) msg.obj;
mNetworkActivityTracker.handleReportNetworkActivity(arg);
break;
case EVENT_MOBILE_DATA_PREFERRED_UIDS_CHANGED:
handleMobileDataPreferredUidsChanged();
@@ -11064,11 +11065,34 @@ public class ConnectivityService extends IConnectivityManager.Stub
notifyDataStallSuspected(p, network.getNetId());
}
/**
* Class to hold the information for network activity change event from idle timers
* {@link NetdCallback#onInterfaceClassActivityChanged(boolean, int, long, int)}
*/
private static final class NetworkActivityParams {
public final boolean isActive;
// Label used for idle timer. Transport type is used as label.
// label is int since NMS was using the identifier as int, and it has not been changed
public final int label;
public final long timestampNs;
// Uid represents the uid that was responsible for waking the radio.
// -1 for no uid and uid is -1 if isActive is false.
public final int uid;
NetworkActivityParams(boolean isActive, int label, long timestampNs, int uid) {
this.isActive = isActive;
this.label = label;
this.timestampNs = timestampNs;
this.uid = uid;
}
}
private class NetdCallback extends BaseNetdUnsolicitedEventListener {
@Override
public void onInterfaceClassActivityChanged(boolean isActive, int transportType,
public void onInterfaceClassActivityChanged(boolean isActive, int label,
long timestampNs, int uid) {
mNetworkActivityTracker.setAndReportNetworkActive(isActive, transportType, timestampNs);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REPORT_NETWORK_ACTIVITY,
new NetworkActivityParams(isActive, label, timestampNs, uid)));
}
@Override
@@ -11103,7 +11127,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
private boolean mNetworkActive;
@GuardedBy("mActiveIdleTimers")
private final ArrayMap<String, IdleTimerParams> mActiveIdleTimers = new ArrayMap<>();
private final Handler mHandler;
private static class IdleTimerParams {
public final int timeout;
@@ -11115,17 +11138,16 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
LegacyNetworkActivityTracker(@NonNull Context context, @NonNull Handler handler,
@NonNull INetd netd) {
LegacyNetworkActivityTracker(@NonNull Context context, @NonNull INetd netd) {
mContext = context;
mNetd = netd;
mHandler = handler;
}
public void setAndReportNetworkActive(boolean active, int transportType, long tsNanos) {
sendDataActivityBroadcast(transportTypeToLegacyType(transportType), active, tsNanos);
public void handleReportNetworkActivity(NetworkActivityParams activityParams) {
sendDataActivityBroadcast(transportTypeToLegacyType(activityParams.label),
activityParams.isActive, activityParams.timestampNs);
synchronized (mActiveIdleTimers) {
mNetworkActive = active;
mNetworkActive = activityParams.isActive;
// If there are no idle timers, it means that system is not monitoring
// activity, so the system default network for those default network
// unspecified apps is always considered active.
@@ -11135,7 +11157,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// the mActiveIdleTimers should be always not empty. The legacy behavior
// is no-op. Remove to refer to mNetworkActive only.
if (mNetworkActive || mActiveIdleTimers.isEmpty()) {
mHandler.sendMessage(mHandler.obtainMessage(EVENT_REPORT_NETWORK_ACTIVITY));
reportNetworkActive();
}
}
}
@@ -11159,13 +11181,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
@GuardedBy("mActiveIdleTimers")
public void handleReportNetworkActivity() {
synchronized (mActiveIdleTimers) {
reportNetworkActive();
}
}
// This is deprecated and only to support legacy use cases.
private int transportTypeToLegacyType(int type) {
switch (type) {