From 79bc5d54a86ecd6e6c9f69b3d24c8cc270945297 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Thu, 23 Sep 2021 16:12:17 -0400 Subject: [PATCH] Move NetworkController & friends to a connectivity package None of the files have been changed other than moving the package around Test: atest SystemUITests Bug: 197851948 Change-Id: I1906761ef4d0f6ab979b8338cc1842b649982d70 Merged-In: I1906761ef4d0f6ab979b8338cc1842b649982d70 --- .../systemui/dagger/DependencyProvider.java | 2 +- .../qs/carrier/QSCarrierGroupController.java | 4 +- .../android/systemui/qs/tiles/CastTile.java | 4 +- .../systemui/qs/tiles/CellularTile.java | 8 +- .../systemui/qs/tiles/InternetTile.java | 14 +- .../android/systemui/qs/tiles/WifiTile.java | 10 +- .../dialog/InternetDialogController.java | 4 +- .../statusbar/OperatorNameViewController.java | 2 +- .../AccessPointControllerImpl.java | 9 +- .../CallbackHandler.java | 20 +- .../EthernetIcons.java | 2 +- .../EthernetSignalController.java | 8 +- .../MobileSignalController.java | 26 +-- .../NetworkController.java | 29 ++- .../NetworkControllerImpl.java | 35 ++- .../SignalController.java | 20 +- .../{policy => connectivity}/WifiIcons.java | 3 +- .../WifiSignalController.java | 11 +- .../phone/CollapsedStatusBarFragment.java | 4 +- .../systemui/statusbar/phone/StatusBar.java | 2 +- .../phone/StatusBarSignalPolicy.java | 10 +- .../phone/dagger/StatusBarPhoneModule.java | 2 +- .../policy/dagger/StatusBarPolicyModule.java | 6 +- .../carrier/QSCarrierGroupControllerTest.java | 4 +- .../systemui/qs/tiles/CastTileTest.java | 4 +- .../dialog/InternetDialogControllerTest.java | 4 +- .../AccessPointControllerImplTest.kt | 2 +- .../CallbackHandlerTest.java | 15 +- .../NetworkControllerBaseTest.java | 17 +- .../NetworkControllerDataTest.java | 19 +- .../NetworkControllerEthernetTest.java | 20 +- .../NetworkControllerSignalTest.java | 217 +++++++++--------- .../NetworkControllerWifiTest.java | 27 ++- .../phone/CollapsedStatusBarFragmentTest.java | 2 +- .../statusbar/phone/StatusBarTest.java | 2 +- .../utils/leaks/FakeNetworkController.java | 4 +- .../systemui/utils/leaks/LeakCheckedTest.java | 2 +- 37 files changed, 334 insertions(+), 240 deletions(-) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/AccessPointControllerImpl.java (98%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/CallbackHandler.java (94%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/EthernetIcons.java (93%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/EthernetSignalController.java (92%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/MobileSignalController.java (97%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/NetworkController.java (94%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/NetworkControllerImpl.java (98%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/SignalController.java (92%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/WifiIcons.java (97%) rename packages/SystemUI/src/com/android/systemui/statusbar/{policy => connectivity}/WifiSignalController.java (97%) rename packages/SystemUI/tests/src/com/android/systemui/statusbar/{policy => connectivity}/AccessPointControllerImplTest.kt (99%) rename packages/SystemUI/tests/src/com/android/systemui/statusbar/{policy => connectivity}/CallbackHandlerTest.java (92%) rename packages/SystemUI/tests/src/com/android/systemui/statusbar/{policy => connectivity}/NetworkControllerBaseTest.java (97%) rename packages/SystemUI/tests/src/com/android/systemui/statusbar/{policy => connectivity}/NetworkControllerDataTest.java (94%) rename packages/SystemUI/tests/src/com/android/systemui/statusbar/{policy => connectivity}/NetworkControllerEthernetTest.java (71%) rename packages/SystemUI/tests/src/com/android/systemui/statusbar/{policy => connectivity}/NetworkControllerSignalTest.java (78%) rename packages/SystemUI/tests/src/com/android/systemui/statusbar/{policy => connectivity}/NetworkControllerWifiTest.java (94%) diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java b/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java index 2d873f26c0c2a..e1174052bc4e6 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java @@ -63,11 +63,11 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.DevicePolicyManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListeners; import com.android.systemui.shared.system.WindowManagerWrapper; +import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.ConfigurationControllerImpl; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.DataSaverController; -import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.theme.ThemeOverlayApplier; import com.android.systemui.unfold.UnfoldTransitionFactory; import com.android.systemui.unfold.UnfoldTransitionProgressProvider; diff --git a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java b/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java index 953f9fb10657b..fec61d911577a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java @@ -42,8 +42,8 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.plugins.ActivityStarter; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; import com.android.systemui.util.CarrierConfigTracker; import java.util.function.Consumer; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java index 04f089d31664d..9de6ceb2de4b7 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java @@ -51,13 +51,13 @@ import com.android.systemui.qs.QSDetailItems.Item; import com.android.systemui.qs.QSHost; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.statusbar.policy.CastController; import com.android.systemui.statusbar.policy.CastController.CastDevice; import com.android.systemui.statusbar.policy.HotspotController; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index b1af8416e06d6..35dadd45eb3e6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -56,11 +56,11 @@ import com.android.systemui.qs.QSHost; import com.android.systemui.qs.SignalTileView; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; import com.android.systemui.statusbar.phone.SystemUIDialog; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; import javax.inject.Inject; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java index 530804ed09e7e..98d0a72685ba4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java @@ -52,13 +52,13 @@ import com.android.systemui.qs.QSHost; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.qs.tiles.dialog.InternetDialogFactory; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.AccessPointController; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; -import com.android.systemui.statusbar.policy.WifiIcons; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.AccessPointController; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; +import com.android.systemui.statusbar.connectivity.WifiIcons; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index 41a3020191a6f..e6e7e21263bb8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -52,11 +52,11 @@ import com.android.systemui.qs.QSHost; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSIconViewImpl; import com.android.systemui.qs.tileimpl.QSTileImpl; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.AccessPointController; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; -import com.android.systemui.statusbar.policy.WifiIcons; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.AccessPointController; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; +import com.android.systemui.statusbar.connectivity.WifiIcons; import com.android.wifitrackerlib.WifiEntry; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java index aaba5efc92f67..b9cd08e8ac77b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java @@ -75,9 +75,9 @@ import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.AccessPointController; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.AccessPointController; import com.android.systemui.toast.SystemUIToast; import com.android.systemui.toast.ToastFactory; import com.android.systemui.util.CarrierConfigTracker; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java index e49f48f2cf498..bcba5cc09c5d3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameViewController.java @@ -26,7 +26,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.systemui.demomode.DemoModeCommandReceiver; import com.android.systemui.plugins.DarkIconDispatcher; -import com.android.systemui.statusbar.policy.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.tuner.TunerService; import com.android.systemui.util.ViewController; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/AccessPointControllerImpl.java similarity index 98% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java rename to packages/SystemUI/src/com/android/systemui/statusbar/connectivity/AccessPointControllerImpl.java index 6d6320e6962db..a23d73d7ed843 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/AccessPointControllerImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import android.content.Context; import android.content.Intent; @@ -55,6 +55,7 @@ import java.util.concurrent.Executor; import javax.inject.Inject; +/** */ public class AccessPointControllerImpl implements NetworkController.AccessPointController, WifiPickerTracker.WifiPickerTrackerCallback, LifecycleOwner { @@ -116,17 +117,19 @@ public class AccessPointControllerImpl super.finalize(); } + /** */ public boolean canConfigWifi() { return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, new UserHandle(mCurrentUser)); } + /** */ public boolean canConfigMobileData() { return !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, UserHandle.of(mCurrentUser)) && mUserTracker.getUserInfo().isAdmin(); } - public void onUserSwitched(int newUserId) { + void onUserSwitched(int newUserId) { mCurrentUser = newUserId; } @@ -225,7 +228,7 @@ public class AccessPointControllerImpl } } - public void dump(PrintWriter pw) { + void dump(PrintWriter pw) { IndentingPrintWriter ipw = new IndentingPrintWriter(pw); ipw.println("AccessPointControllerImpl:"); ipw.increaseIndent(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/CallbackHandler.java similarity index 94% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java rename to packages/SystemUI/src/com/android/systemui/statusbar/connectivity/CallbackHandler.java index 7ac6d63430d69..052a789200e66 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/CallbackHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import android.os.Handler; import android.os.Looper; @@ -22,11 +22,11 @@ import android.telephony.SubscriptionInfo; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.statusbar.policy.NetworkController.EmergencyListener; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.EmergencyListener; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; import java.io.PrintWriter; import java.text.SimpleDateFormat; @@ -235,7 +235,7 @@ public class CallbackHandler extends Handler implements EmergencyListener, Signa .append("icon=").append(icon) .toString(); recordLastCallback(log); - obtainMessage(MSG_ETHERNET_CHANGED, icon).sendToTarget();; + obtainMessage(MSG_ETHERNET_CHANGED, icon).sendToTarget(); } @Override @@ -252,14 +252,14 @@ public class CallbackHandler extends Handler implements EmergencyListener, Signa .toString(); recordLastCallback(log); } - obtainMessage(MSG_AIRPLANE_MODE_CHANGED, icon).sendToTarget();; + obtainMessage(MSG_AIRPLANE_MODE_CHANGED, icon).sendToTarget(); } - public void setListening(EmergencyListener listener, boolean listening) { + void setListening(EmergencyListener listener, boolean listening) { obtainMessage(MSG_ADD_REMOVE_EMERGENCY, listening ? 1 : 0, 0, listener).sendToTarget(); } - public void setListening(SignalCallback listener, boolean listening) { + void setListening(SignalCallback listener, boolean listening) { obtainMessage(MSG_ADD_REMOVE_SIGNAL, listening ? 1 : 0, 0, listener).sendToTarget(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/EthernetIcons.java similarity index 93% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetIcons.java rename to packages/SystemUI/src/com/android/systemui/statusbar/connectivity/EthernetIcons.java index b391bd9cf6517..196aad99dcb51 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/EthernetIcons.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/EthernetSignalController.java similarity index 92% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetSignalController.java rename to packages/SystemUI/src/com/android/systemui/statusbar/connectivity/EthernetSignalController.java index 80b75a740965a..c9d40adde6444 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EthernetSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/EthernetSignalController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import android.content.Context; import android.net.NetworkCapabilities; @@ -21,12 +21,12 @@ import android.net.NetworkCapabilities; import com.android.settingslib.AccessibilityContentDescriptions; import com.android.settingslib.SignalIcon.IconGroup; import com.android.settingslib.SignalIcon.State; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; import java.util.BitSet; - +/** */ public class EthernetSignalController extends SignalController { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java rename to packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java index a543c7c95d16f..20ef4eec0b971 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import static com.android.settingslib.mobile.MobileMappings.getDefaultIcons; import static com.android.settingslib.mobile.MobileMappings.getIconKey; @@ -58,9 +58,9 @@ import com.android.settingslib.mobile.TelephonyIcons; import com.android.settingslib.net.SignalStrengthUtil; import com.android.systemui.R; import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; import com.android.systemui.util.CarrierConfigTracker; import java.io.PrintWriter; @@ -245,7 +245,7 @@ public class MobileSignalController extends SignalController subscriptions) { + void setCurrentSubscriptionsLocked(List subscriptions) { Collections.sort(subscriptions, new Comparator() { @Override public int compare(SubscriptionInfo lhs, SubscriptionInfo rhs) { @@ -1125,6 +1135,7 @@ public class NetworkControllerImpl extends BroadcastReceiver mEthernetSignalController.updateConnectivity(mConnectedTransports, mValidatedTransports); } + /** */ public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println("NetworkController state:"); @@ -1178,7 +1189,7 @@ public class NetworkControllerImpl extends BroadcastReceiver mCallbackHandler.dump(pw); } - private static final String emergencyToString(int emergencySource) { + private static String emergencyToString(int emergencySource) { if (emergencySource > EMERGENCY_NO_SUB) { return "ASSUMED_VOICE_CONTROLLER(" + (emergencySource - EMERGENCY_VOICE_CONTROLLER) + ")"; @@ -1423,10 +1434,12 @@ public class NetworkControllerImpl extends BroadcastReceiver return info; } + /** */ public boolean hasEmergencyCryptKeeperText() { return EncryptionHelper.IS_DATA_ENCRYPTED; } + /** */ public boolean isRadioOn() { return !mAirplaneMode; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalController.java similarity index 92% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java rename to packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalController.java index 4b6722c17b859..d23dba579be61 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalController.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; -import static com.android.systemui.statusbar.policy.NetworkControllerImpl.TAG; +import static com.android.systemui.statusbar.connectivity.NetworkControllerImpl.TAG; import android.annotation.NonNull; import android.content.Context; @@ -23,8 +23,8 @@ import android.util.Log; import com.android.settingslib.SignalIcon.IconGroup; import com.android.settingslib.SignalIcon.State; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; import java.io.PrintWriter; import java.util.BitSet; @@ -83,7 +83,7 @@ public abstract class SignalController { return mCurrentState; } - public void updateConnectivity(BitSet connectedTransports, BitSet validatedTransports) { + void updateConnectivity(BitSet connectedTransports, BitSet validatedTransports) { mCurrentState.inetCondition = validatedTransports.get(mTransportType) ? 1 : 0; notifyListenersIfNecessary(); } @@ -114,7 +114,7 @@ public abstract class SignalController { return false; } - public void saveLastState() { + void saveLastState() { if (RECORD_HISTORY) { recordLastState(); } @@ -161,7 +161,7 @@ public abstract class SignalController { } } - public void notifyListenersIfNecessary() { + void notifyListenersIfNecessary() { if (isDirty()) { saveLastState(); notifyListeners(); @@ -192,7 +192,7 @@ public abstract class SignalController { mHistoryIndex = (mHistoryIndex + 1) % HISTORY_SIZE; } - public void dump(PrintWriter pw) { + void dump(PrintWriter pw) { pw.println(" - " + mTag + " -----"); pw.println(" Current State: " + mCurrentState); if (RECORD_HISTORY) { @@ -210,7 +210,7 @@ public abstract class SignalController { } } - public final void notifyListeners() { + final void notifyListeners() { notifyListeners(mCallbackHandler); } @@ -219,7 +219,7 @@ public abstract class SignalController { * based on current state, and only need to be called in the scenario where * mCurrentState != mLastState. */ - public abstract void notifyListeners(SignalCallback callback); + abstract void notifyListeners(SignalCallback callback); /** * Generate a blank T. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java rename to packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java index 577cc4fd16b6d..3c449ad270efd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiIcons.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import com.android.settingslib.AccessibilityContentDescriptions; import com.android.settingslib.R; import com.android.settingslib.SignalIcon.IconGroup; +/** */ public class WifiIcons { static final int[] WIFI_FULL_ICONS = { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java rename to packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java index 3f7ddc6c15389..3622a66767a3a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/WifiSignalController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN; import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_INOUT; @@ -37,14 +37,15 @@ import com.android.settingslib.mobile.TelephonyIcons; import com.android.settingslib.wifi.WifiStatusTracker; import com.android.systemui.R; import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; import java.io.PrintWriter; import java.util.Objects; +/** */ public class WifiSignalController extends SignalController { private final boolean mHasMobileDataFeature; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java index c16cc125aece5..989f6b85668b4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java @@ -46,6 +46,8 @@ import com.android.systemui.statusbar.DisableFlagsLogger.DisableState; import com.android.systemui.statusbar.OperatorNameView; import com.android.systemui.statusbar.OperatorNameViewController; import com.android.systemui.statusbar.StatusBarState; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; import com.android.systemui.statusbar.events.SystemStatusAnimationCallback; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.phone.StatusBarIconController.DarkIconManager; @@ -53,8 +55,6 @@ import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallListener; import com.android.systemui.statusbar.policy.EncryptionHelper; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; import org.jetbrains.annotations.NotNull; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 3bdc08be63e6a..2130e028e8637 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -199,6 +199,7 @@ import com.android.systemui.statusbar.PowerButtonReveal; import com.android.systemui.statusbar.PulseExpansionHandler; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.SysuiStatusBarStateController; +import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.notification.DynamicPrivacyController; import com.android.systemui.statusbar.notification.NotificationActivityStarter; @@ -226,7 +227,6 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; import com.android.systemui.statusbar.policy.ExtensionController; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.tuner.TunerService; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java index 71364320839c4..fbd9ef7e37074 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java @@ -26,11 +26,11 @@ import com.android.settingslib.mobile.TelephonyIcons; import com.android.systemui.R; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.flags.FeatureFlags; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; -import com.android.systemui.statusbar.policy.NetworkControllerImpl; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; +import com.android.systemui.statusbar.connectivity.NetworkControllerImpl; import com.android.systemui.statusbar.policy.SecurityController; import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService.Tunable; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java index 0d43b9323a398..568970790a180 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java @@ -62,6 +62,7 @@ import com.android.systemui.statusbar.NotificationViewHierarchyManager; import com.android.systemui.statusbar.OperatorNameViewController; import com.android.systemui.statusbar.PulseExpansionHandler; import com.android.systemui.statusbar.SysuiStatusBarStateController; +import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.notification.DynamicPrivacyController; import com.android.systemui.statusbar.notification.NotificationEntryManager; @@ -104,7 +105,6 @@ import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.ExtensionController; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.tuner.TunerService; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java index 1eec639670eeb..92908790770a1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java @@ -23,7 +23,9 @@ import com.android.internal.R; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.settings.UserTracker; -import com.android.systemui.statusbar.policy.AccessPointControllerImpl; +import com.android.systemui.statusbar.connectivity.AccessPointControllerImpl; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkControllerImpl; import com.android.systemui.statusbar.policy.BluetoothController; import com.android.systemui.statusbar.policy.BluetoothControllerImpl; import com.android.systemui.statusbar.policy.CastController; @@ -42,8 +44,6 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.KeyguardStateControllerImpl; import com.android.systemui.statusbar.policy.LocationController; import com.android.systemui.statusbar.policy.LocationControllerImpl; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkControllerImpl; import com.android.systemui.statusbar.policy.NextAlarmController; import com.android.systemui.statusbar.policy.NextAlarmControllerImpl; import com.android.systemui.statusbar.policy.RotationLockController; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java index a1b72104509bf..8ae7100e2e60f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java @@ -39,8 +39,8 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.CarrierTextManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.plugins.ActivityStarter; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; import com.android.systemui.util.CarrierConfigTracker; import com.android.systemui.utils.leaks.LeakCheckedTest; import com.android.systemui.utils.os.FakeHandler; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java index e939411e4a2a5..f0bd06571eb98 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java @@ -43,12 +43,12 @@ import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.qs.QSTileHost; import com.android.systemui.qs.logging.QSLogger; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; import com.android.systemui.statusbar.policy.CastController; import com.android.systemui.statusbar.policy.CastController.CastDevice; import com.android.systemui.statusbar.policy.HotspotController; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; import org.junit.Before; import org.junit.Test; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java index f9d5be6c48077..fe328395b89ff 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java @@ -48,9 +48,9 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.AccessPointController; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.AccessPointController; import com.android.systemui.toast.SystemUIToast; import com.android.systemui.toast.ToastFactory; import com.android.systemui.util.CarrierConfigTracker; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/AccessPointControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/AccessPointControllerImplTest.kt similarity index 99% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/AccessPointControllerImplTest.kt rename to packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/AccessPointControllerImplTest.kt index 4068f93f5ee38..7896a26badbe1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/AccessPointControllerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/AccessPointControllerImplTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.policy +package com.android.systemui.statusbar.connectivity import android.os.UserManager import android.test.suitebuilder.annotation.SmallTest diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java similarity index 92% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java rename to packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java index 3c55df934f76a..11a53c55c0248 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/CallbackHandlerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; @@ -28,11 +28,11 @@ import androidx.test.runner.AndroidJUnit4; import com.android.settingslib.mobile.TelephonyIcons; import com.android.systemui.SysuiTestCase; -import com.android.systemui.statusbar.policy.NetworkController.EmergencyListener; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.EmergencyListener; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; import com.android.systemui.tests.R; import org.junit.Before; @@ -182,7 +182,8 @@ public class CallbackHandlerTest extends SysuiTestCase { @Test public void testSignalCallback_setIsAirplaneMode() { - IconState state = new IconState(true, R.drawable.stat_sys_airplane_mode, "Test Description"); + IconState state = + new IconState(true, R.drawable.stat_sys_airplane_mode, "Test Description"); mHandler.setIsAirplaneMode(state); waitForCallbacks(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java similarity index 97% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java rename to packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java index c488ee95aa3c7..67cab7413f1f6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WWAN; import static android.telephony.NetworkRegistrationInfo.DOMAIN_PS; @@ -72,10 +72,11 @@ import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.demomode.DemoModeController; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.MobileDataIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; +import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; -import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; import com.android.systemui.telephony.TelephonyListenerManager; import com.android.systemui.util.CarrierConfigTracker; import com.android.systemui.util.concurrency.FakeExecutor; @@ -268,7 +269,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { setSubscriptions(mSubId); mMobileSignalController = mNetworkController.mMobileSignalControllers.get(mSubId); ArgumentCaptor callbackArg = - ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class); + ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class); verify(mMockCm, atLeastOnce()) .registerDefaultNetworkCallback(callbackArg.capture(), isA(Handler.class)); int captureSize = callbackArg.getAllValues().size(); @@ -404,7 +405,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { } private static void setConnectivityCommon(NetworkCapabilities.Builder builder, - int networkType, boolean validated, boolean isConnected){ + int networkType, boolean validated, boolean isConnected) { // TODO: Separate out into several NetworkCapabilities. if (isConnected) { builder.addTransportType(networkType); @@ -538,7 +539,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { } protected void verifyLastMobileDataIndicators(boolean visible, int icon, int typeIcon, - boolean roaming, boolean inet) { + boolean roaming, boolean inet) { ArgumentCaptor indicatorsArg = ArgumentCaptor.forClass(MobileDataIndicators.class); @@ -646,7 +647,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { } protected void assertNetworkNameEquals(String expected) { - assertEquals("Network name", expected, mMobileSignalController.getState().networkName); + assertEquals("Network name", expected, mMobileSignalController.getState().networkName); } protected void assertDataNetworkNameEquals(String expected) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java similarity index 94% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java rename to packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java index 3433a14f54e7a..00dedd9610747 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java @@ -1,4 +1,20 @@ -package com.android.systemui.statusbar.policy; +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.connectivity; import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WWAN; import static android.telephony.NetworkRegistrationInfo.DOMAIN_PS; @@ -22,6 +38,7 @@ import android.testing.TestableLooper.RunWithLooper; import com.android.settingslib.mobile.TelephonyIcons; import com.android.settingslib.net.DataUsageController; import com.android.systemui.dump.DumpManager; +import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.util.CarrierConfigTracker; import org.junit.Test; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerEthernetTest.java similarity index 71% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java rename to packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerEthernetTest.java index 6aab9c762a953..675d755ad3e35 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerEthernetTest.java @@ -1,4 +1,20 @@ -package com.android.systemui.statusbar.policy; +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.connectivity; import static junit.framework.Assert.assertEquals; @@ -7,7 +23,7 @@ import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; -import com.android.systemui.statusbar.policy.NetworkController.IconState; +import com.android.systemui.statusbar.connectivity.NetworkController.IconState; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java similarity index 78% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java rename to packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java index 4ff13011567b9..73eddd166f882 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.systemui.statusbar.connectivity; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; @@ -42,6 +42,7 @@ import com.android.settingslib.mobile.TelephonyIcons; import com.android.settingslib.net.DataUsageController; import com.android.systemui.R; import com.android.systemui.dump.DumpManager; +import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.util.CarrierConfigTracker; import org.junit.Test; @@ -280,7 +281,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { // TODO: Put this somewhere else, maybe in its own file. @Test public void testHasCorrectMobileControllers() { - int[] testSubscriptions = new int[] { 1, 5, 3 }; + int[] testSubscriptions = new int[]{1, 5, 3}; int notTestSubscription = 0; MobileSignalController mobileSignalController = Mockito.mock(MobileSignalController.class); @@ -312,8 +313,8 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { // We will not add one subscription to make sure it's controller gets removed. int indexToSkipSubscription = 1; - int[] testSubscriptions = new int[] { 1, 5, 3 }; - MobileSignalController[] mobileSignalControllers = new MobileSignalController[] { + int[] testSubscriptions = new int[]{1, 5, 3}; + MobileSignalController[] mobileSignalControllers = new MobileSignalController[]{ Mockito.mock(MobileSignalController.class), Mockito.mock(MobileSignalController.class), Mockito.mock(MobileSignalController.class), @@ -401,24 +402,24 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { @Test public void testOnReceive_stringsUpdatedAction_bothFalse() { Intent intent = createStringsUpdatedIntent(false /* showSpn */, - "Irrelevant" /* spn */, - false /* showPlmn */, - "Irrelevant" /* plmn */); + "Irrelevant" /* spn */, + false /* showPlmn */, + "Irrelevant" /* plmn */); mNetworkController.onReceive(mContext, intent); String defaultNetworkName = mMobileSignalController .getTextIfExists( - com.android.internal.R.string.lockscreen_carrier_default).toString(); + com.android.internal.R.string.lockscreen_carrier_default).toString(); assertNetworkNameEquals(defaultNetworkName); } @Test public void testOnReceive_stringsUpdatedAction_bothTrueAndNull() { Intent intent = createStringsUpdatedIntent(true /* showSpn */, - null /* spn */, - true /* showPlmn */, - null /* plmn */); + null /* spn */, + true /* showPlmn */, + null /* plmn */); mNetworkController.onReceive(mContext, intent); @@ -433,15 +434,15 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { String plmn = "Test2"; Intent intent = createStringsUpdatedIntent(true /* showSpn */, - spn /* spn */, - true /* showPlmn */, - plmn /* plmn */); + spn /* spn */, + true /* showPlmn */, + plmn /* plmn */); mNetworkController.onReceive(mContext, intent); assertNetworkNameEquals(plmn + mMobileSignalController.getTextIfExists( - R.string.status_bar_network_name_separator).toString() + R.string.status_bar_network_name_separator).toString() + spn); } @@ -477,145 +478,149 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { @Test public void testOnUpdateDataActivity_dataOut() { - setupDefaultSignal(); + setupDefaultSignal(); - updateDataActivity(TelephonyManager.DATA_ACTIVITY_OUT); + updateDataActivity(TelephonyManager.DATA_ACTIVITY_OUT); - verifyLastQsMobileDataIndicators(true /* visible */, - DEFAULT_LEVEL /* icon */, - DEFAULT_QS_ICON /* typeIcon */, - false /* dataIn */, - true /* dataOut */); + verifyLastQsMobileDataIndicators(true /* visible */, + DEFAULT_LEVEL /* icon */, + DEFAULT_QS_ICON /* typeIcon */, + false /* dataIn */, + true /* dataOut */); } @Test public void testOnUpdateDataActivity_dataInOut() { - setupDefaultSignal(); + setupDefaultSignal(); - updateDataActivity(TelephonyManager.DATA_ACTIVITY_INOUT); + updateDataActivity(TelephonyManager.DATA_ACTIVITY_INOUT); - verifyLastQsMobileDataIndicators(true /* visible */, - DEFAULT_LEVEL /* icon */, - DEFAULT_QS_ICON /* typeIcon */, - true /* dataIn */, - true /* dataOut */); + verifyLastQsMobileDataIndicators(true /* visible */, + DEFAULT_LEVEL /* icon */, + DEFAULT_QS_ICON /* typeIcon */, + true /* dataIn */, + true /* dataOut */); } @Test public void testOnUpdateDataActivity_dataActivityNone() { - setupDefaultSignal(); + setupDefaultSignal(); - updateDataActivity(TelephonyManager.DATA_ACTIVITY_NONE); + updateDataActivity(TelephonyManager.DATA_ACTIVITY_NONE); - verifyLastQsMobileDataIndicators(true /* visible */, - DEFAULT_LEVEL /* icon */, - DEFAULT_QS_ICON /* typeIcon */, - false /* dataIn */, - false /* dataOut */); + verifyLastQsMobileDataIndicators(true /* visible */, + DEFAULT_LEVEL /* icon */, + DEFAULT_QS_ICON /* typeIcon */, + false /* dataIn */, + false /* dataOut */); } @Test public void testCarrierNetworkChange_carrierNetworkChange() { - int strength = SignalStrength.SIGNAL_STRENGTH_GREAT; + int strength = SignalStrength.SIGNAL_STRENGTH_GREAT; - setupDefaultSignal(); - setLevel(strength); + setupDefaultSignal(); + setLevel(strength); - // Verify baseline - verifyLastMobileDataIndicators(true /* visible */, - strength /* strengthIcon */, - DEFAULT_ICON /* typeIcon */); + // Verify baseline + verifyLastMobileDataIndicators(true /* visible */, + strength /* strengthIcon */, + DEFAULT_ICON /* typeIcon */); - // API call is made - setCarrierNetworkChange(true /* enabled */); + // API call is made + setCarrierNetworkChange(true /* enabled */); - // Carrier network change is true, show special indicator - verifyLastMobileDataIndicators(true /* visible */, - SignalDrawable.getCarrierChangeState(CellSignalStrength.getNumSignalStrengthLevels()), - 0 /* typeIcon */); + // Carrier network change is true, show special indicator + verifyLastMobileDataIndicators(true /* visible */, + SignalDrawable.getCarrierChangeState( + CellSignalStrength.getNumSignalStrengthLevels()), + 0 /* typeIcon */); - // Revert back - setCarrierNetworkChange(false /* enabled */); + // Revert back + setCarrierNetworkChange(false /* enabled */); - // Verify back in previous state - verifyLastMobileDataIndicators(true /* visible */, - strength /* strengthIcon */, - DEFAULT_ICON /* typeIcon */); + // Verify back in previous state + verifyLastMobileDataIndicators(true /* visible */, + strength /* strengthIcon */, + DEFAULT_ICON /* typeIcon */); } @Test public void testCarrierNetworkChange_roamingBeforeNetworkChange() { - int strength = SignalStrength.SIGNAL_STRENGTH_GREAT; + int strength = SignalStrength.SIGNAL_STRENGTH_GREAT; - setupDefaultSignal(); - setLevel(strength); - setGsmRoaming(true); + setupDefaultSignal(); + setLevel(strength); + setGsmRoaming(true); - // Verify baseline - verifyLastMobileDataIndicators(true /* visible */, - strength /* strengthIcon */, - DEFAULT_ICON /* typeIcon */, - true /* roaming */); + // Verify baseline + verifyLastMobileDataIndicators(true /* visible */, + strength /* strengthIcon */, + DEFAULT_ICON /* typeIcon */, + true /* roaming */); - // API call is made - setCarrierNetworkChange(true /* enabled */); + // API call is made + setCarrierNetworkChange(true /* enabled */); - // Carrier network change is true, show special indicator, no roaming. - verifyLastMobileDataIndicators(true /* visible */, - SignalDrawable.getCarrierChangeState(CellSignalStrength.getNumSignalStrengthLevels()), - 0 /* typeIcon */, - false /* roaming */); + // Carrier network change is true, show special indicator, no roaming. + verifyLastMobileDataIndicators(true /* visible */, + SignalDrawable.getCarrierChangeState( + CellSignalStrength.getNumSignalStrengthLevels()), + 0 /* typeIcon */, + false /* roaming */); - // Revert back - setCarrierNetworkChange(false /* enabled */); + // Revert back + setCarrierNetworkChange(false /* enabled */); - // Verify back in previous state - verifyLastMobileDataIndicators(true /* visible */, - strength /* strengthIcon */, - DEFAULT_ICON /* typeIcon */, - true /* roaming */); + // Verify back in previous state + verifyLastMobileDataIndicators(true /* visible */, + strength /* strengthIcon */, + DEFAULT_ICON /* typeIcon */, + true /* roaming */); } @Test public void testCarrierNetworkChange_roamingAfterNetworkChange() { - int strength = SignalStrength.SIGNAL_STRENGTH_GREAT; + int strength = SignalStrength.SIGNAL_STRENGTH_GREAT; - setupDefaultSignal(); - setLevel(strength); + setupDefaultSignal(); + setLevel(strength); - // Verify baseline - verifyLastMobileDataIndicators(true /* visible */, - strength /* strengthIcon */, - DEFAULT_ICON /* typeIcon */, - false /* roaming */); + // Verify baseline + verifyLastMobileDataIndicators(true /* visible */, + strength /* strengthIcon */, + DEFAULT_ICON /* typeIcon */, + false /* roaming */); - // API call is made - setCarrierNetworkChange(true /* enabled */); + // API call is made + setCarrierNetworkChange(true /* enabled */); - // Carrier network change is true, show special indicator, no roaming. - verifyLastMobileDataIndicators(true /* visible */, - SignalDrawable.getCarrierChangeState(CellSignalStrength.getNumSignalStrengthLevels()), - 0 /* typeIcon */, - false /* roaming */); + // Carrier network change is true, show special indicator, no roaming. + verifyLastMobileDataIndicators(true /* visible */, + SignalDrawable.getCarrierChangeState( + CellSignalStrength.getNumSignalStrengthLevels()), + 0 /* typeIcon */, + false /* roaming */); - setGsmRoaming(true); + setGsmRoaming(true); - // Roaming should not show. - verifyLastMobileDataIndicators(true /* visible */, - SignalDrawable.getCarrierChangeState(CellSignalStrength.getNumSignalStrengthLevels()), - 0 /* typeIcon */, - false /* roaming */); + // Roaming should not show. + verifyLastMobileDataIndicators(true /* visible */, + SignalDrawable.getCarrierChangeState( + CellSignalStrength.getNumSignalStrengthLevels()), + 0 /* typeIcon */, + false /* roaming */); - // Revert back - setCarrierNetworkChange(false /* enabled */); + // Revert back + setCarrierNetworkChange(false /* enabled */); - // Verify back in previous state - verifyLastMobileDataIndicators(true /* visible */, - strength /* strengthIcon */, - DEFAULT_ICON /* typeIcon */, - true /* roaming */); + // Verify back in previous state + verifyLastMobileDataIndicators(true /* visible */, + strength /* strengthIcon */, + DEFAULT_ICON /* typeIcon */, + true /* roaming */); } private void verifyEmergencyOnly(boolean isEmergencyOnly) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java similarity index 94% rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java rename to packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java index 4a5770d122397..ffeaf207942b5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java @@ -1,10 +1,25 @@ -package com.android.systemui.statusbar.policy; +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.connectivity; import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -21,7 +36,7 @@ import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; import com.android.settingslib.mobile.TelephonyIcons; -import com.android.systemui.statusbar.policy.NetworkController.WifiIndicators; +import com.android.systemui.statusbar.connectivity.NetworkController.WifiIndicators; import org.junit.Before; import org.junit.Test; @@ -165,7 +180,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { } @Test - public void testWifiIconDisconnectedViaCallback(){ + public void testWifiIconDisconnectedViaCallback() { // Setup normal connection String testSsid = "Test SSID"; int testLevel = 2; @@ -183,7 +198,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { } @Test - public void testVpnWithUnderlyingWifi(){ + public void testVpnWithUnderlyingWifi() { String testSsid = "Test SSID"; int testLevel = 2; setWifiEnabled(true); @@ -299,7 +314,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { protected void setWifiLevel(int level) { float amountPerLevel = (MAX_RSSI - MIN_RSSI) / (WifiIcons.WIFI_LEVEL_COUNT - 1); - int rssi = (int)(MIN_RSSI + level * amountPerLevel); + int rssi = (int) (MIN_RSSI + level * amountPerLevel); // Put RSSI in the middle of the range. rssi += amountPerLevel / 2; when(mWifiInfo.getRssi()).thenReturn(rssi); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java index b08dbee687e6a..f23f14801484e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java @@ -45,10 +45,10 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.DisableFlagsLogger; import com.android.systemui.statusbar.OperatorNameViewController; +import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; import org.junit.Before; import org.junit.Ignore; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index fdda76df64d7d..6868e1855c654 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -112,6 +112,7 @@ import com.android.systemui.statusbar.OperatorNameViewController; import com.android.systemui.statusbar.PulseExpansionHandler; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.StatusBarStateControllerImpl; +import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.notification.DynamicPrivacyController; import com.android.systemui.statusbar.notification.NotificationEntryManager; @@ -137,7 +138,6 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.ExtensionController; import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.statusbar.policy.KeyguardStateController; -import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.tuner.TunerService; diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeNetworkController.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeNetworkController.java index e7acfae24f30f..8ea9da6f4d0e4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeNetworkController.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeNetworkController.java @@ -18,9 +18,9 @@ import android.os.Bundle; import android.testing.LeakCheck; import com.android.settingslib.net.DataUsageController; +import com.android.systemui.statusbar.connectivity.NetworkController; +import com.android.systemui.statusbar.connectivity.NetworkController.SignalCallback; import com.android.systemui.statusbar.policy.DataSaverController; -import com.android.systemui.statusbar.policy.NetworkController; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; public class FakeNetworkController extends BaseLeakChecker implements NetworkController { diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java index fedc08d93bc7b..dc6a8fb9a4c4a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java @@ -19,6 +19,7 @@ import android.util.ArrayMap; import com.android.systemui.SysuiTestCase; import com.android.systemui.shared.plugins.PluginManager; +import com.android.systemui.statusbar.connectivity.NetworkController; import com.android.systemui.statusbar.phone.ManagedProfileController; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.policy.BatteryController; @@ -29,7 +30,6 @@ import com.android.systemui.statusbar.policy.FlashlightController; import com.android.systemui.statusbar.policy.HotspotController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.LocationController; -import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NextAlarmController; import com.android.systemui.statusbar.policy.RotationLockController; import com.android.systemui.statusbar.policy.SecurityController;