diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java b/packages/SettingsLib/src/com/android/settingslib/net/MobileDataController.java similarity index 93% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java rename to packages/SettingsLib/src/com/android/settingslib/net/MobileDataController.java index a7fdadc52822d..642b60e2e24a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java +++ b/packages/SettingsLib/src/com/android/settingslib/net/MobileDataController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 The Android Open Source Project + * Copyright (C) 2015 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. @@ -14,14 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.policy; - -import static android.net.ConnectivityManager.TYPE_MOBILE; -import static android.net.NetworkStatsHistory.FIELD_RX_BYTES; -import static android.net.NetworkStatsHistory.FIELD_TX_BYTES; -import static android.telephony.TelephonyManager.SIM_STATE_READY; -import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH; -import static android.text.format.DateUtils.FORMAT_SHOW_DATE; +package com.android.settingslib.net; import android.content.Context; import android.net.ConnectivityManager; @@ -42,7 +35,14 @@ import android.util.Log; import java.util.Date; import java.util.Locale; -public class MobileDataControllerImpl implements NetworkController.MobileDataController { +import static android.net.ConnectivityManager.TYPE_MOBILE; +import static android.net.NetworkStatsHistory.FIELD_RX_BYTES; +import static android.net.NetworkStatsHistory.FIELD_TX_BYTES; +import static android.telephony.TelephonyManager.SIM_STATE_READY; +import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH; +import static android.text.format.DateUtils.FORMAT_SHOW_DATE; + +public class MobileDataController { private static final String TAG = "MobileDataController"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -60,9 +60,9 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon private INetworkStatsSession mSession; private Callback mCallback; - private NetworkControllerImpl mNetworkController; + private NetworkNameProvider mNetworkController; - public MobileDataControllerImpl(Context context) { + public MobileDataController(Context context) { mContext = context; mTelephonyManager = TelephonyManager.from(context); mConnectivityManager = ConnectivityManager.from(context); @@ -71,7 +71,7 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon mPolicyManager = NetworkPolicyManager.from(mContext); } - public void setNetworkController(NetworkControllerImpl networkController) { + public void setNetworkController(NetworkNameProvider networkController) { mNetworkController = networkController; } @@ -161,7 +161,7 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon } else { usage.warningLevel = DEFAULT_WARNING_LEVEL; } - if (usage != null) { + if (usage != null && mNetworkController != null) { usage.carrier = mNetworkController.getMobileDataNetworkName(); } return usage; @@ -231,6 +231,18 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon } } + public interface NetworkNameProvider { + String getMobileDataNetworkName(); + } + + public static class DataUsageInfo { + public String carrier; + public String period; + public long limitLevel; + public long warningLevel; + public long usageLevel; + } + public interface Callback { void onMobileDataEnabled(boolean enabled); } diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java new file mode 100644 index 0000000000000..fabae573e4b00 --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2015 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.settingslib.wifi; + +import android.content.Intent; +import android.net.NetworkInfo; +import android.net.wifi.WifiConfiguration; +import android.net.wifi.WifiInfo; +import android.net.wifi.WifiManager; + +import java.util.List; + +public class WifiStatusTracker { + + private final WifiManager mWifiManager; + public boolean enabled; + public boolean connected; + public String ssid; + public int rssi; + public int level; + + public WifiStatusTracker(WifiManager wifiManager) { + mWifiManager = wifiManager; + } + + public void handleBroadcast(Intent intent) { + String action = intent.getAction(); + if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { + enabled = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, + WifiManager.WIFI_STATE_UNKNOWN) == WifiManager.WIFI_STATE_ENABLED; + } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { + final NetworkInfo networkInfo = (NetworkInfo) + intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO); + connected = networkInfo != null && networkInfo.isConnected(); + // If Connected grab the signal strength and ssid. + if (connected) { + // try getting it out of the intent first + WifiInfo info = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) != null + ? (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) + : mWifiManager.getConnectionInfo(); + if (info != null) { + ssid = getSsid(info); + } else { + ssid = null; + } + } else if (!connected) { + ssid = null; + } + } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) { + // Default to -200 as its below WifiManager.MIN_RSSI. + rssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200); + level = WifiManager.calculateSignalLevel(rssi, 5); + } + } + + private String getSsid(WifiInfo info) { + String ssid = info.getSSID(); + if (ssid != null) { + return ssid; + } + // OK, it's not in the connectionInfo; we have to go hunting for it + List networks = mWifiManager.getConfiguredNetworks(); + int length = networks.size(); + for (int i = 0; i < length; i++) { + if (networks.get(i).networkId == info.getNetworkId()) { + return networks.get(i).SSID; + } + } + return null; + } +} 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 e2d2ffbebf93a..a0bbbe3d20434 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -23,16 +23,14 @@ import android.content.res.Resources; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; - import com.android.internal.logging.MetricsLogger; +import com.android.settingslib.net.MobileDataController; import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.SignalTileView; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NetworkController.IconState; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataController; -import com.android.systemui.statusbar.policy.NetworkController.MobileDataController.DataUsageInfo; import com.android.systemui.statusbar.policy.SignalCallbackAdapter; /** Quick settings tile: Cellular **/ @@ -247,7 +245,7 @@ public class CellularTile extends QSTile { final DataUsageDetailView v = (DataUsageDetailView) (convertView != null ? convertView : LayoutInflater.from(mContext).inflate(R.layout.data_usage, parent, false)); - final DataUsageInfo info = mDataController.getDataUsageInfo(); + final MobileDataController.DataUsageInfo info = mDataController.getDataUsageInfo(); if (info == null) return v; v.bind(info); return v; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java index d0ae383435816..d814b1c2fd335 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java @@ -23,11 +23,10 @@ import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; - +import com.android.settingslib.net.MobileDataController; import com.android.systemui.FontSizeUtils; import com.android.systemui.R; import com.android.systemui.qs.DataUsageGraph; -import com.android.systemui.statusbar.policy.NetworkController; import java.text.DecimalFormat; @@ -60,7 +59,7 @@ public class DataUsageDetailView extends LinearLayout { R.dimen.qs_data_usage_text_size); } - public void bind(NetworkController.MobileDataController.DataUsageInfo info) { + public void bind(MobileDataController.DataUsageInfo info) { final Resources res = mContext.getResources(); final int titleId; final long bytes; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 38656ee0781eb..f8c72b335379c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -19,7 +19,7 @@ package com.android.systemui.statusbar.policy; import android.content.Context; import android.content.Intent; import android.telephony.SubscriptionInfo; - +import com.android.settingslib.net.MobileDataController; import com.android.settingslib.wifi.AccessPoint; import java.util.List; @@ -85,22 +85,4 @@ public interface NetworkController { void onSettingsActivityTriggered(Intent settingsIntent); } } - - /** - * Tracks mobile data support and usage. - */ - public interface MobileDataController { - boolean isMobileDataSupported(); - boolean isMobileDataEnabled(); - void setMobileDataEnabled(boolean enabled); - DataUsageInfo getDataUsageInfo(); - - public static class DataUsageInfo { - public String carrier; - public String period; - public long limitLevel; - public long warningLevel; - public long usageLevel; - } - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 29968081e758e..909f4972ce497 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -16,8 +16,6 @@ package com.android.systemui.statusbar.policy; -import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -39,10 +37,10 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; import android.util.MathUtils; - import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; +import com.android.settingslib.net.MobileDataController; import com.android.systemui.DemoMode; import com.android.systemui.R; @@ -57,9 +55,11 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; + /** Platform implementation of the network controller. **/ public class NetworkControllerImpl extends BroadcastReceiver - implements NetworkController, DemoMode { + implements NetworkController, DemoMode, MobileDataController.NetworkNameProvider { // debug static final String TAG = "NetworkController"; static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -94,7 +94,7 @@ public class NetworkControllerImpl extends BroadcastReceiver // SIM for most actions. This may be null if there aren't any SIMs around. private MobileSignalController mDefaultSignalController; private final AccessPointControllerImpl mAccessPoints; - private final MobileDataControllerImpl mMobileDataController; + private final MobileDataController mMobileDataController; private boolean mInetCondition; // Used for Logging and demo. @@ -139,7 +139,7 @@ public class NetworkControllerImpl extends BroadcastReceiver SubscriptionManager.from(context), Config.readConfig(context), bgLooper, new CallbackHandler(), new AccessPointControllerImpl(context, bgLooper), - new MobileDataControllerImpl(context), + new MobileDataController(context), new SubscriptionDefaults()); mReceiverHandler.post(mRegisterListeners); } @@ -150,7 +150,7 @@ public class NetworkControllerImpl extends BroadcastReceiver SubscriptionManager subManager, Config config, Looper bgLooper, CallbackHandler callbackHandler, AccessPointControllerImpl accessPointController, - MobileDataControllerImpl mobileDataController, + MobileDataController mobileDataController, SubscriptionDefaults defaultsHandler) { mContext = context; mConfig = config; @@ -174,7 +174,7 @@ public class NetworkControllerImpl extends BroadcastReceiver mMobileDataController = mobileDataController; mMobileDataController.setNetworkController(this); // TODO: Find a way to move this into MobileDataController. - mMobileDataController.setCallback(new MobileDataControllerImpl.Callback() { + mMobileDataController.setCallback(new MobileDataController.Callback() { @Override public void onMobileDataEnabled(boolean enabled) { mCallbackHandler.setMobileDataEnabled(enabled); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java index 9b1e72a1648b3..eab6e137bd4c6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java @@ -18,20 +18,16 @@ package com.android.systemui.statusbar.policy; import android.content.Context; import android.content.Intent; import android.net.NetworkCapabilities; -import android.net.NetworkInfo; -import android.net.wifi.WifiConfiguration; -import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.util.Log; - import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.AsyncChannel; +import com.android.settingslib.wifi.WifiStatusTracker; import com.android.systemui.statusbar.policy.NetworkController.IconState; -import java.util.List; import java.util.Objects; @@ -40,12 +36,14 @@ public class WifiSignalController extends private final WifiManager mWifiManager; private final AsyncChannel mWifiChannel; private final boolean mHasMobileData; + private final WifiStatusTracker mWifiTracker; public WifiSignalController(Context context, boolean hasMobileData, CallbackHandler callbackHandler, NetworkControllerImpl networkController) { super("WifiSignalController", context, NetworkCapabilities.TRANSPORT_WIFI, callbackHandler, networkController); mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiTracker = new WifiStatusTracker(mWifiManager); mHasMobileData = hasMobileData; Handler handler = new WifiHandler(); mWifiChannel = new AsyncChannel(); @@ -93,54 +91,15 @@ public class WifiSignalController extends * Extract wifi state directly from broadcasts about changes in wifi state. */ public void handleBroadcast(Intent intent) { - String action = intent.getAction(); - if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { - mCurrentState.enabled = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, - WifiManager.WIFI_STATE_UNKNOWN) == WifiManager.WIFI_STATE_ENABLED; - } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { - final NetworkInfo networkInfo = (NetworkInfo) - intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO); - mCurrentState.connected = networkInfo != null && networkInfo.isConnected(); - // If Connected grab the signal strength and ssid. - if (mCurrentState.connected) { - // try getting it out of the intent first - WifiInfo info = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) != null - ? (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) - : mWifiManager.getConnectionInfo(); - if (info != null) { - mCurrentState.ssid = getSsid(info); - } else { - mCurrentState.ssid = null; - } - } else if (!mCurrentState.connected) { - mCurrentState.ssid = null; - } - } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) { - // Default to -200 as its below WifiManager.MIN_RSSI. - mCurrentState.rssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200); - mCurrentState.level = WifiManager.calculateSignalLevel( - mCurrentState.rssi, WifiIcons.WIFI_LEVEL_COUNT); - } - + mWifiTracker.handleBroadcast(intent); + mCurrentState.enabled = mWifiTracker.enabled; + mCurrentState.connected = mWifiTracker.connected; + mCurrentState.ssid = mWifiTracker.ssid; + mCurrentState.rssi = mWifiTracker.rssi; + mCurrentState.level = mWifiTracker.level; notifyListenersIfNecessary(); } - private String getSsid(WifiInfo info) { - String ssid = info.getSSID(); - if (ssid != null) { - return ssid; - } - // OK, it's not in the connectionInfo; we have to go hunting for it - List networks = mWifiManager.getConfiguredNetworks(); - int length = networks.size(); - for (int i = 0; i < length; i++) { - if (networks.get(i).networkId == info.getNetworkId()) { - return networks.get(i).SSID; - } - } - return null; - } - @VisibleForTesting void setActivity(int wifiActivity) { mCurrentState.activityIn = wifiActivity == WifiManager.DATA_ACTIVITY_INOUT diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index 30c08cdd224a7..1282a68b7421e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -33,6 +33,7 @@ import android.telephony.TelephonyManager; import android.util.Log; import com.android.internal.telephony.cdma.EriInfo; +import com.android.settingslib.net.MobileDataControllerImpl; import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkControllerImpl.Config; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java index 0ec8802f9c602..f7d326ed08848 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -4,6 +4,7 @@ import android.os.Looper; import android.telephony.TelephonyManager; import android.test.suitebuilder.annotation.SmallTest; +import com.android.settingslib.net.MobileDataControllerImpl; import org.mockito.Mockito; @SmallTest diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java index 660fd9c40721e..77c5aade1bbd5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java @@ -29,6 +29,7 @@ import android.test.suitebuilder.annotation.SmallTest; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; +import com.android.settingslib.net.MobileDataControllerImpl; import com.android.systemui.R; import org.mockito.ArgumentCaptor;