Merge "Expose WifiConfiguration @hide APIs as @SystemApi" (58bea80f) · Commits · e / os / android_frameworks_base

api/system-current.txt

+70 −0

Original line number	Diff line number	Diff line
		@@ -5140,19 +5140,46 @@ package android.net.wifi {
		}

		@Deprecated public class WifiConfiguration implements android.os.Parcelable {
		method @Deprecated public int getAuthType();
		method @Deprecated @NonNull public android.net.IpConfiguration.IpAssignment getIpAssignment();
		method @Deprecated @NonNull public android.net.wifi.WifiConfiguration.NetworkSelectionStatus getNetworkSelectionStatus();
		method @Deprecated @NonNull public String getPrintableSsid();
		method @Deprecated @NonNull public android.net.IpConfiguration.ProxySettings getProxySettings();
		method @Deprecated @Nullable public android.net.StaticIpConfiguration getStaticIpConfiguration();
		method @Deprecated public boolean hasNoInternetAccess();
		method @Deprecated public boolean isEphemeral();
		method @Deprecated public static boolean isMetered(@Nullable android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiInfo);
		method @Deprecated public boolean isNoInternetAccessExpected();
		method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration);
		method @Deprecated public void setProxy(@NonNull android.net.IpConfiguration.ProxySettings, @NonNull android.net.ProxyInfo);
		field @Deprecated public static final int AP_BAND_2GHZ = 0; // 0x0
		field @Deprecated public static final int AP_BAND_5GHZ = 1; // 0x1
		field @Deprecated public static final int AP_BAND_ANY = -1; // 0xffffffff
		field @Deprecated public static final int INVALID_NETWORK_ID = -1; // 0xffffffff
		field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1
		field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0
		field @Deprecated public static final int METERED_OVERRIDE_NOT_METERED = 2; // 0x2
		field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0
		field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1
		field @Deprecated public boolean allowAutojoin;
		field @Deprecated public int apBand;
		field @Deprecated public int carrierId;
		field @Deprecated public String creatorName;
		field @Deprecated public int creatorUid;
		field @Deprecated public boolean fromWifiNetworkSpecifier;
		field @Deprecated public boolean fromWifiNetworkSuggestion;
		field @Deprecated public String lastUpdateName;
		field @Deprecated public int lastUpdateUid;
		field @Deprecated public int macRandomizationSetting;
		field @Deprecated public boolean meteredHint;
		field @Deprecated public int meteredOverride;
		field @Deprecated public int numAssociation;
		field @Deprecated public int numScorerOverride;
		field @Deprecated public int numScorerOverrideAndSwitchedNetwork;
		field @Deprecated @NonNull public final android.net.wifi.WifiConfiguration.RecentFailure recentFailure;
		field @Deprecated public boolean requirePMF;
		field @Deprecated @Nullable public String saePasswordId;
		field @Deprecated public boolean shared;
		field @Deprecated public boolean useExternalScores;
		}

		@@ -5160,6 +5187,49 @@ package android.net.wifi {
		field @Deprecated public static final int WPA2_PSK = 4; // 0x4
		}

		@Deprecated public static class WifiConfiguration.NetworkSelectionStatus {
		method @Deprecated public int getDisableReasonCounter(int);
		method @Deprecated public long getDisableTime();
		method @Deprecated public boolean getHasEverConnected();
		method @Deprecated @Nullable public static String getNetworkDisableReasonString(int);
		method @Deprecated public int getNetworkSelectionDisableReason();
		method @Deprecated @NonNull public String getNetworkStatusString();
		method @Deprecated public boolean isNetworkEnabled();
		method @Deprecated public boolean isNetworkPermanentlyDisabled();
		field @Deprecated public static final int DISABLED_ASSOCIATION_REJECTION = 1; // 0x1
		field @Deprecated public static final int DISABLED_AUTHENTICATION_FAILURE = 2; // 0x2
		field @Deprecated public static final int DISABLED_AUTHENTICATION_NO_CREDENTIALS = 5; // 0x5
		field @Deprecated public static final int DISABLED_AUTHENTICATION_NO_SUBSCRIPTION = 9; // 0x9
		field @Deprecated public static final int DISABLED_BY_WIFI_MANAGER = 7; // 0x7
		field @Deprecated public static final int DISABLED_BY_WRONG_PASSWORD = 8; // 0x8
		field @Deprecated public static final int DISABLED_DHCP_FAILURE = 3; // 0x3
		field @Deprecated public static final int DISABLED_NO_INTERNET_PERMANENT = 6; // 0x6
		field @Deprecated public static final int DISABLED_NO_INTERNET_TEMPORARY = 4; // 0x4
		field @Deprecated public static final int NETWORK_SELECTION_DISABLED_MAX = 10; // 0xa
		field @Deprecated public static final int NETWORK_SELECTION_ENABLE = 0; // 0x0
		}

		@Deprecated public static class WifiConfiguration.RecentFailure {
		method @Deprecated public int getAssociationStatus();
		field @Deprecated public static final int NONE = 0; // 0x0
		field @Deprecated public static final int STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11
		}

		public class WifiEnterpriseConfig implements android.os.Parcelable {
		method @Nullable public String[] getCaCertificateAliases();
		method @NonNull public String getCaPath();
		method @NonNull public String getClientCertificateAlias();
		method public int getOcsp();
		method public void setCaCertificateAliases(@Nullable String[]);
		method public void setCaPath(@Nullable String);
		method public void setClientCertificateAlias(@Nullable String);
		method public void setOcsp(int);
		field public static final int OCSP_NONE = 0; // 0x0
		field public static final int OCSP_REQUEST_CERT_STATUS = 1; // 0x1
		field public static final int OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS = 3; // 0x3
		field public static final int OCSP_REQUIRE_CERT_STATUS = 2; // 0x2
		}

		public class WifiFrameworkInitializer {
		method public static void registerServiceWrappers();
		}

api/system-lint-baseline.txt

+25 −0

Original line number	Diff line number	Diff line
		@@ -152,10 +152,35 @@ MissingNullability: android.telephony.mbms.DownloadRequest.Builder#setServiceId(




		MutableBareField: android.net.IpConfiguration#httpProxy:
		Bare field httpProxy must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.IpConfiguration#ipAssignment:
		Bare field ipAssignment must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.IpConfiguration#proxySettings:
		Bare field proxySettings must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.IpConfiguration#staticIpConfiguration:
		Bare field staticIpConfiguration must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.wifi.WifiConfiguration#allowAutojoin:

		MutableBareField: android.net.wifi.WifiConfiguration#apBand:
		Bare field apBand must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.wifi.WifiConfiguration#carrierId:

		MutableBareField: android.net.wifi.WifiConfiguration#fromWifiNetworkSpecifier:
		Bare field fromWifiNetworkSpecifier must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.wifi.WifiConfiguration#fromWifiNetworkSuggestion:
		Bare field fromWifiNetworkSuggestion must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.wifi.WifiConfiguration#macRandomizationSetting:
		Bare field macRandomizationSetting must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.wifi.WifiConfiguration#meteredOverride:
		Bare field meteredOverride must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.wifi.WifiConfiguration#requirePMF:
		Bare field requirePMF must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.wifi.WifiConfiguration#saePasswordId:
		Bare field saePasswordId must be marked final, or moved behind accessors if mutable
		MutableBareField: android.net.wifi.WifiConfiguration#shared:
		Bare field shared must be marked final, or moved behind accessors if mutable


		NoClone: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #0:

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -1098,16 +1098,12 @@ public class AccessPoint implements Comparable<AccessPoint> {
		summary.append(mContext.getString(R.string.wifi_check_password_try_again));
		break;
		case WifiConfiguration.NetworkSelectionStatus.DISABLED_DHCP_FAILURE:
		case WifiConfiguration.NetworkSelectionStatus.DISABLED_DNS_FAILURE:
		summary.append(mContext.getString(R.string.wifi_disabled_network_failure));
		break;
		case WifiConfiguration.NetworkSelectionStatus.DISABLED_ASSOCIATION_REJECTION:
		summary.append(mContext.getString(R.string.wifi_disabled_generic));
		break;
		}
		} else if (mConfig != null && mConfig.getNetworkSelectionStatus().isNotRecommended()) {
		summary.append(mContext.getString(
		R.string.wifi_disabled_by_recommendation_provider));
		} else if (mIsCarrierAp) {
		summary.append(String.format(mContext.getString(
		R.string.available_via_carrier), mCarrierName));

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -518,8 +518,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
		int networkId, final List<WifiConfiguration> configs) {
		if (configs != null) {
		for (WifiConfiguration config : configs) {
		if (mLastInfo != null && networkId == config.networkId &&
		!(config.selfAdded && config.numAssociation == 0)) {
		if (mLastInfo != null && networkId == config.networkId) {
		return config;
		}
		}

packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ import java.util.Map;

		public class WifiUtils {

		private static final int INVALID_RSSI = -127;

		public static String buildLoggingSummary(AccessPoint accessPoint, WifiConfiguration config) {
		final StringBuilder summary = new StringBuilder();
		final WifiInfo info = accessPoint.getInfo();
		@@ -106,8 +108,8 @@ public class WifiUtils {
		visibility.append(String.format("rx=%.1f", info.getRxSuccessRate()));
		}

		int maxRssi5 = WifiConfiguration.INVALID_RSSI;
		int maxRssi24 = WifiConfiguration.INVALID_RSSI;
		int maxRssi5 = INVALID_RSSI;
		int maxRssi24 = INVALID_RSSI;
		final int maxDisplayedScans = 4;
		int num5 = 0; // number of scanned BSSID on 5GHz band
		int num24 = 0; // number of scanned BSSID on 2.4Ghz band