PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Show connected networks in APM/APM networks" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-02 01:53:04 +00:00
committed by Android (Google) Code Review
parent 5e57390696 f1489b51a3
commit 9531fb8ffb
11 changed files with 330 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/ConnectedEthernetNetworkController.java
View File

@@ -33,7 +33,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
* PreferenceController to show the connected ethernet network.
*/
public class ConnectedEthernetNetworkController extends AbstractPreferenceController
implements InternetUpdater.OnInternetTypeChangedListener {
implements InternetUpdater.InternetChangeListener {
public static final String KEY = "connected_ethernet_network";

43
src/com/android/settings/network/InternetPreferenceController.java
View File

@@ -19,10 +19,10 @@ package com.android.settings.network;
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
import static com.android.settings.network.InternetUpdater.INTERNET_APM;
import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
import static com.android.settings.network.InternetUpdater.INTERNET_CELLULAR;
import static com.android.settings.network.InternetUpdater.INTERNET_ETHERNET;
import static com.android.settings.network.InternetUpdater.INTERNET_NETWORKS_AVAILABLE;
import static com.android.settings.network.InternetUpdater.INTERNET_OFF;
import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
import android.content.Context;
@@ -53,7 +53,7 @@ import java.util.Map;
*/
public class InternetPreferenceController extends AbstractPreferenceController implements
LifecycleObserver, SummaryUpdater.OnSummaryChangeListener,
InternetUpdater.OnInternetTypeChangedListener {
InternetUpdater.InternetChangeListener {
public static final String KEY = "internet_settings";
@@ -65,8 +65,8 @@ public class InternetPreferenceController extends AbstractPreferenceController i
@VisibleForTesting
static Map<Integer, Integer> sIconMap = new HashMap<>();
static {
sIconMap.put(INTERNET_APM, R.drawable.ic_airplanemode_active);
sIconMap.put(INTERNET_APM_NETWORKS, R.drawable.ic_airplane_safe_networks_24dp);
sIconMap.put(INTERNET_OFF, R.drawable.ic_no_internet_unavailable);
sIconMap.put(INTERNET_NETWORKS_AVAILABLE, R.drawable.ic_no_internet_available);
sIconMap.put(INTERNET_WIFI, R.drawable.ic_wifi_signal_4);
sIconMap.put(INTERNET_CELLULAR, R.drawable.ic_network_cell);
sIconMap.put(INTERNET_ETHERNET, R.drawable.ic_settings_ethernet);
@@ -74,8 +74,8 @@ public class InternetPreferenceController extends AbstractPreferenceController i
private static Map<Integer, Integer> sSummaryMap = new HashMap<>();
static {
sSummaryMap.put(INTERNET_APM, R.string.condition_airplane_title);
sSummaryMap.put(INTERNET_APM_NETWORKS, R.string.airplane_mode_network_available);
sSummaryMap.put(INTERNET_OFF, R.string.condition_airplane_title);
sSummaryMap.put(INTERNET_NETWORKS_AVAILABLE, R.string.disconnected);
sSummaryMap.put(INTERNET_WIFI, 0);
sSummaryMap.put(INTERNET_CELLULAR, 0);
sSummaryMap.put(INTERNET_ETHERNET, R.string.to_switch_networks_disconnect_ethernet);
@@ -114,8 +114,8 @@ public class InternetPreferenceController extends AbstractPreferenceController i
}
}
if (mustUseWiFiHelperSummary(mSummaryHelper.isWifiConnected(),
mSummaryHelper.getSummary())) {
if (mInternetType == INTERNET_WIFI) {
mPreference.setSummary(mSummaryHelper.getSummary());
return;
}
@@ -124,6 +124,12 @@ public class InternetPreferenceController extends AbstractPreferenceController i
return;
}
if (mInternetType == INTERNET_NETWORKS_AVAILABLE
&& mInternetUpdater.isApmNetworksAvailable()) {
mPreference.setSummary(R.string.airplane_mode_network_available);
return;
}
final @IdRes int summary = sSummaryMap.get(mInternetType);
if (summary != 0) {
mPreference.setSummary(summary);
@@ -157,6 +163,7 @@ public class InternetPreferenceController extends AbstractPreferenceController i
*
* @param internetType the internet type
*/
@Override
public void onInternetTypeChanged(@InternetUpdater.InternetType int internetType) {
final boolean needUpdate = (internetType != mInternetType);
mInternetType = internetType;
@@ -167,19 +174,21 @@ public class InternetPreferenceController extends AbstractPreferenceController i
}
}
/**
* Called when airplane mode state is changed.
*/
@Override
public void onSummaryChanged(String summary) {
mustUseWiFiHelperSummary(mSummaryHelper.isWifiConnected(), summary);
public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
ThreadUtils.postOnMainThread(() -> {
updateState(mPreference);
});
}
@VisibleForTesting
boolean mustUseWiFiHelperSummary(boolean isWifiConnected, String summary) {
final boolean needUpdate = (mInternetType == INTERNET_WIFI)
|| (mInternetType == INTERNET_APM_NETWORKS && isWifiConnected);
if (needUpdate && mPreference != null) {
@Override
public void onSummaryChanged(String summary) {
if (mInternetType == INTERNET_WIFI && mPreference != null) {
mPreference.setSummary(summary);
}
return needUpdate;
}
@VisibleForTesting

149
src/com/android/settings/network/InternetUpdater.java
View File

@@ -34,6 +34,7 @@ import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkCapabilities.Transport;
import android.net.wifi.WifiManager;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
@@ -55,27 +56,45 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
private static final String TAG = "InternetUpdater";
private OnInternetTypeChangedListener mOnInternetTypeChangedListener;
private InternetChangeListener mListener;
/** Interface that handles the internet type changed callback */
public interface OnInternetTypeChangedListener {
/** Interface that handles the internet updater callback */
public interface InternetChangeListener {
/**
* Called when internet type is changed.
*
* @param internetType the internet type
*/
void onInternetTypeChanged(@InternetType int internetType);
default void onInternetTypeChanged(@InternetType int internetType) {};
/**
* Called when airplane mode state is changed.
*/
default void onAirplaneModeChanged(boolean isAirplaneModeOn) {};
/**
* Called when airplane mode networks state is changed.
*/
default void onAirplaneModeNetworksChanged(boolean available) {};
}
/**
* Indicates this internet is unavailable type in airplane mode on.
* Indicates the internet is off when airplane mode is on.
*/
public static final int INTERNET_APM = 0;
public static final int INTERNET_OFF = 0;
/**
* Indicates this internet uses an airplane mode network type.
* Indicates this internet is not connected (includes no networks connected) or network(s)
* available.
*
* Examples include:
* <p>When airplane mode is turned off, and some networks (Wi-Fi, Mobile-data) are turned on,
* but no network can access the Internet.
*
* <p>When the airplane mode is turned on, and the WiFi is also turned on, but the WiFi is not
* connected or cannot access the Internet.
*/
public static final int INTERNET_APM_NETWORKS = 1;
public static final int INTERNET_NETWORKS_AVAILABLE = 1;
/**
* Indicates this internet uses a Wi-Fi network type.
@@ -94,8 +113,8 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
@Retention(RetentionPolicy.SOURCE)
@android.annotation.IntDef(prefix = { "INTERNET_" }, value = {
INTERNET_APM,
INTERNET_APM_NETWORKS,
INTERNET_OFF,
INTERNET_NETWORKS_AVAILABLE,
INTERNET_WIFI,
INTERNET_CELLULAR,
INTERNET_ETHERNET,
@@ -110,6 +129,8 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
@VisibleForTesting
AirplaneModeEnabler mAirplaneModeEnabler;
@VisibleForTesting
boolean mInternetAvailable;
@VisibleForTesting
@Transport int mTransport;
private static Map<Integer, Integer> sTransportMap = new HashMap<>();
@@ -120,22 +141,14 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
}
private NetworkCallback mNetworkCallback = new NetworkCallback() {
public void onCapabilitiesChanged(@NonNull Network network,
@NonNull NetworkCapabilities networkCapabilities) {
checkNetworkCapabilities(networkCapabilities);
}
@Override
public void onAvailable(@NonNull Network network) {
if (network == null) {
return;
}
final NetworkCapabilities networkCapabilities =
mConnectivityManager.getNetworkCapabilities(network);
if (networkCapabilities == null) {
return;
}
for (@Transport int transport : networkCapabilities.getTransportTypes()) {
if (sTransportMap.containsKey(transport)) {
mTransport = transport;
break;
}
}
public void onLost(@NonNull Network network) {
mInternetAvailable = false;
update();
}
};
@@ -143,18 +156,22 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
private final BroadcastReceiver mWifiStateReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
update();
fetchActiveNetwork();
if (mListener != null && mAirplaneModeEnabler.isAirplaneModeOn()) {
mListener.onAirplaneModeNetworksChanged(
mWifiManager.getWifiState() == WifiManager.WIFI_STATE_ENABLED);
}
}
};
public InternetUpdater(Context context, Lifecycle lifecycle,
OnInternetTypeChangedListener listener) {
public InternetUpdater(Context context, Lifecycle lifecycle, InternetChangeListener listener) {
mContext = context;
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, this);
mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
mWifiManager = mContext.getSystemService(WifiManager.class);
mWifiStateFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
mOnInternetTypeChangedListener = listener;
mListener = listener;
fetchActiveNetwork();
if (lifecycle != null) {
lifecycle.addObserver(this);
}
@@ -178,18 +195,65 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
@Override
public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
fetchActiveNetwork();
if (mListener != null) {
mListener.onAirplaneModeChanged(isAirplaneModeOn);
}
}
private void fetchActiveNetwork() {
Network activeNetwork = mConnectivityManager.getActiveNetwork();
if (activeNetwork == null) {
mInternetAvailable = false;
update();
return;
}
NetworkCapabilities activeNetworkCapabilities =
mConnectivityManager.getNetworkCapabilities(activeNetwork);
if (activeNetworkCapabilities == null) {
mInternetAvailable = false;
update();
return;
}
checkNetworkCapabilities(activeNetworkCapabilities);
}
private void checkNetworkCapabilities(@NonNull NetworkCapabilities networkCapabilities) {
if (!networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
mInternetAvailable = false;
update();
return;
}
boolean internetAvailable = false;
for (@Transport int transport : networkCapabilities.getTransportTypes()) {
if (sTransportMap.containsKey(transport)) {
mTransport = transport;
internetAvailable = true;
Log.i(TAG, "Detect an internet capability network with transport type: "
+ mTransport);
break;
}
}
mInternetAvailable = internetAvailable;
update();
}
@VisibleForTesting
void update() {
if (mAirplaneModeEnabler.isAirplaneModeOn()) {
mInternetType = mWifiManager.isWifiEnabled() ? INTERNET_APM_NETWORKS : INTERNET_APM;
} else {
mInternetType = sTransportMap.get(mTransport);
@InternetType int internetType = INTERNET_NETWORKS_AVAILABLE;
if (mInternetAvailable) {
internetType = sTransportMap.get(mTransport);
} else if (mAirplaneModeEnabler.isAirplaneModeOn()
&& mWifiManager.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
internetType = INTERNET_OFF;
}
if (mOnInternetTypeChangedListener != null) {
mOnInternetTypeChangedListener.onInternetTypeChanged(mInternetType);
mInternetType = internetType;
if (mListener != null) {
mListener.onInternetTypeChanged(mInternetType);
}
}
@@ -199,4 +263,19 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
public @InternetType int getInternetType() {
return mInternetType;
}
/**
* Return ture when the airplane mode is on.
*/
public boolean isAirplaneModeOn() {
return mAirplaneModeEnabler.isAirplaneModeOn();
}
/**
* Return ture when the APM networks is available.
*/
public boolean isApmNetworksAvailable() {
return mAirplaneModeEnabler.isAirplaneModeOn()
&& (mWifiManager.getWifiState() == WifiManager.WIFI_STATE_ENABLED);
}
}

5
src/com/android/settings/network/telephony/NetworkProviderWorker.java
View File

@@ -49,9 +49,8 @@ import java.util.Collections;
*/
public class NetworkProviderWorker extends WifiScanWorker implements
SignalStrengthListener.Callback, MobileDataEnabledListener.Client,
DataConnectivityListener.Client,
SubscriptionsChangeListener.SubscriptionsChangeListenerClient,
InternetUpdater.OnInternetTypeChangedListener {
DataConnectivityListener.Client, InternetUpdater.InternetChangeListener,
SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
private static final String TAG = "NetworkProviderWorker";
private static final int PROVIDER_MODEL_DEFAULT_EXPANDED_ROW_COUNT = 4;
private DataContentObserver mMobileDataObserver;