diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 83afa83d07..f5c6cc9748 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -1704,8 +1704,7 @@ public class ConnectivityService extends IConnectivityManager.Stub mUserAllContext.registerReceiver(mPackageIntentReceiver, packageIntentFilter, null /* broadcastPermission */, mHandler); - mNetworkActivityTracker = - new LegacyNetworkActivityTracker(mContext, mNetd, mHandler, mDeps.isAtLeastU()); + mNetworkActivityTracker = new LegacyNetworkActivityTracker(mContext, mNetd, mHandler); final NetdCallback netdCallback = new NetdCallback(); try { @@ -11141,7 +11140,6 @@ public class ConnectivityService extends IConnectivityManager.Stub // This needs to be volatile to allow non handler threads to read this value without lock. private volatile boolean mIsDefaultNetworkActive; private final ArrayMap mActiveIdleTimers = new ArrayMap<>(); - private final boolean mIsAtLeastU; private static class IdleTimerParams { public final int timeout; @@ -11154,11 +11152,10 @@ public class ConnectivityService extends IConnectivityManager.Stub } LegacyNetworkActivityTracker(@NonNull Context context, @NonNull INetd netd, - @NonNull Handler handler, boolean isAtLeastU) { + @NonNull Handler handler) { mContext = context; mNetd = netd; mHandler = handler; - mIsAtLeastU = isAtLeastU; } private void ensureRunningOnConnectivityServiceThread() { @@ -11319,8 +11316,8 @@ public class ConnectivityService extends IConnectivityManager.Stub boolean hasIdleTimer) { if (defaultNetwork != null) { mIsDefaultNetworkActive = true; - // On T-, callbacks are called only when the network has the idle timer. - if (mIsAtLeastU || hasIdleTimer) { + // Callbacks are called only when the network has the idle timer. + if (hasIdleTimer) { reportNetworkActive(); } } else { diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 5dd40487cc..da5c1755b6 100755 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -11320,12 +11320,12 @@ public class ConnectivityServiceTest { } @Test - public void testOnNetworkActive_NewEthernetConnects_Callback() throws Exception { - // On T-, LegacyNetworkActivityTracker calls onNetworkActive callback only for networks that + public void testOnNetworkActive_NewEthernetConnects_CallbackNotCalled() throws Exception { + // LegacyNetworkActivityTracker calls onNetworkActive callback only for networks that // tracker adds the idle timer to. And the tracker does not set the idle timer for the // ethernet network. // So onNetworkActive is not called when the ethernet becomes the default network - doTestOnNetworkActive_NewNetworkConnects(TRANSPORT_ETHERNET, mDeps.isAtLeastU()); + doTestOnNetworkActive_NewNetworkConnects(TRANSPORT_ETHERNET, false /* expectCallback */); } @Test