Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[IT4.1] Clean up to remove no-op logic" am: af0c29529d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd472961055fbfc3d40b8982c4ae1118d58351e7
This commit is contained in:
Chiachang Wang
2020-12-23 06:30:23 +00:00
committed by Automerger Merge Worker
parent 04aa5eac85 af0c29529d
commit 57957ec100
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -396,22 +396,12 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
* Notify our observers of a change in the data activity state of the interface * Notify our observers of a change in the data activity state of the interface
*/ */
private void notifyInterfaceClassActivity(int type, boolean isActive, long tsNanos, private void notifyInterfaceClassActivity(int type, boolean isActive, long tsNanos,
int uid, boolean fromRadio) { int uid) {
final boolean isMobile = ConnectivityManager.isNetworkTypeMobile(type); final boolean isMobile = ConnectivityManager.isNetworkTypeMobile(type);
int powerState = isActive int powerState = isActive
? DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH ? DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH
: DataConnectionRealTimeInfo.DC_POWER_STATE_LOW; : DataConnectionRealTimeInfo.DC_POWER_STATE_LOW;
if (isMobile) { if (isMobile) {
if (!fromRadio) {
if (mMobileActivityFromRadio) {
// If this call is not coming from a report from the radio itself, but we
// have previously received reports from the radio, then we will take the
// power state to just be whatever the radio last reported.
powerState = mLastPowerStateFromRadio;
}
} else {
mMobileActivityFromRadio = true;
}
if (mLastPowerStateFromRadio != powerState) { if (mLastPowerStateFromRadio != powerState) {
mLastPowerStateFromRadio = powerState; mLastPowerStateFromRadio = powerState;
try { try {
@@ -431,15 +421,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
} }
} }
if (!isMobile || fromRadio || !mMobileActivityFromRadio) { final boolean active = isActive;
// Report the change in data activity. We don't do this if this is a change invokeForAllObservers(o -> o.interfaceClassDataActivityChanged(
// on the mobile network, that is not coming from the radio itself, and we Integer.toString(type), active, tsNanos, uid));
// have previously seen change reports from the radio. In that case only
// the radio is the authority for the current state.
final boolean active = isActive;
invokeForAllObservers(o -> o.interfaceClassDataActivityChanged(
Integer.toString(type), active, tsNanos, uid));
}
boolean report = false; boolean report = false;
synchronized (mIdleTimerLock) { synchronized (mIdleTimerLock) {
@@ -671,7 +655,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
timestampNanos = timestamp; timestampNanos = timestamp;
} }
mDaemonHandler.post(() -> mDaemonHandler.post(() ->
notifyInterfaceClassActivity(label, isActive, timestampNanos, uid, false)); notifyInterfaceClassActivity(label, isActive, timestampNanos, uid));
} }
@Override @Override
@@ -1157,7 +1141,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
mNetworkActive = false; mNetworkActive = false;
} }
mDaemonHandler.post(() -> notifyInterfaceClassActivity(type, true, mDaemonHandler.post(() -> notifyInterfaceClassActivity(type, true,
SystemClock.elapsedRealtimeNanos(), -1, false)); SystemClock.elapsedRealtimeNanos(), -1));
} }
} }
@@ -1181,7 +1165,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
} }
mActiveIdleTimers.remove(iface); mActiveIdleTimers.remove(iface);
mDaemonHandler.post(() -> notifyInterfaceClassActivity(params.type, false, mDaemonHandler.post(() -> notifyInterfaceClassActivity(params.type, false,
SystemClock.elapsedRealtimeNanos(), -1, false)); SystemClock.elapsedRealtimeNanos(), -1));
} }
} }