Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WifiOemMigrationHook: Rename class to address API council feedback

Browse Source 
Bug: 149418926
Test: Compiles
Change-Id: I59a6e893599b1ccaec51a39c9594f157622668a0
This commit is contained in:
Roshan Pius
2020-02-24 09:12:52 -08:00
parent 27f83cdbce
commit 807b34a2c6
3 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
api/system-current.txt
View File

@@ -7554,6 +7554,51 @@ package android.net.wifi {
method public void stop(int);
}
public final class WifiMigration {
method @Nullable public static android.net.wifi.WifiMigration.ConfigStoreMigrationData loadFromConfigStore();
method @NonNull public static android.net.wifi.WifiMigration.SettingsMigrationData loadFromSettings(@NonNull android.content.Context);
}
public static final class WifiMigration.ConfigStoreMigrationData implements android.os.Parcelable {
method public int describeContents();
method @Nullable public java.util.List<android.net.wifi.WifiConfiguration> getUserSavedNetworkConfigurations();
method @Nullable public android.net.wifi.SoftApConfiguration getUserSoftApConfiguration();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiMigration.ConfigStoreMigrationData> CREATOR;
}
public static final class WifiMigration.ConfigStoreMigrationData.Builder {
ctor public WifiMigration.ConfigStoreMigrationData.Builder();
method @NonNull public android.net.wifi.WifiMigration.ConfigStoreMigrationData build();
method @NonNull public android.net.wifi.WifiMigration.ConfigStoreMigrationData.Builder setUserSavedNetworkConfigurations(@NonNull java.util.List<android.net.wifi.WifiConfiguration>);
method @NonNull public android.net.wifi.WifiMigration.ConfigStoreMigrationData.Builder setUserSoftApConfiguration(@NonNull android.net.wifi.SoftApConfiguration);
}
public static final class WifiMigration.SettingsMigrationData implements android.os.Parcelable {
method public int describeContents();
method @Nullable public String getP2pDeviceName();
method public boolean isP2pFactoryResetPending();
method public boolean isScanAlwaysAvailable();
method public boolean isScanThrottleEnabled();
method public boolean isSoftApTimeoutEnabled();
method public boolean isVerboseLoggingEnabled();
method public boolean isWakeUpEnabled();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiMigration.SettingsMigrationData> CREATOR;
}
public static final class WifiMigration.SettingsMigrationData.Builder {
ctor public WifiMigration.SettingsMigrationData.Builder();
method @NonNull public android.net.wifi.WifiMigration.SettingsMigrationData build();
method @NonNull public android.net.wifi.WifiMigration.SettingsMigrationData.Builder setP2pDeviceName(@Nullable String);
method @NonNull public android.net.wifi.WifiMigration.SettingsMigrationData.Builder setP2pFactoryResetPending(boolean);
method @NonNull public android.net.wifi.WifiMigration.SettingsMigrationData.Builder setScanAlwaysAvailable(boolean);
method @NonNull public android.net.wifi.WifiMigration.SettingsMigrationData.Builder setScanThrottleEnabled(boolean);
method @NonNull public android.net.wifi.WifiMigration.SettingsMigrationData.Builder setSoftApTimeoutEnabled(boolean);
method @NonNull public android.net.wifi.WifiMigration.SettingsMigrationData.Builder setVerboseLoggingEnabled(boolean);
method @NonNull public android.net.wifi.WifiMigration.SettingsMigrationData.Builder setWakeUpEnabled(boolean);
}
public class WifiNetworkConnectionStatistics implements android.os.Parcelable {
ctor public WifiNetworkConnectionStatistics(int, int);
ctor public WifiNetworkConnectionStatistics();
@@ -7578,51 +7623,6 @@ package android.net.wifi {
method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_CARRIER_PROVISIONING) public android.net.wifi.WifiNetworkSuggestion.Builder setCarrierId(int);
}
public final class WifiOemMigrationHook {
method @Nullable public static android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData loadFromConfigStore();
method @NonNull public static android.net.wifi.WifiOemMigrationHook.SettingsMigrationData loadFromSettings(@NonNull android.content.Context);
}
public static final class WifiOemMigrationHook.ConfigStoreMigrationData implements android.os.Parcelable {
method public int describeContents();
method @Nullable public java.util.List<android.net.wifi.WifiConfiguration> getUserSavedNetworkConfigurations();
method @Nullable public android.net.wifi.SoftApConfiguration getUserSoftApConfiguration();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData> CREATOR;
}
public static final class WifiOemMigrationHook.ConfigStoreMigrationData.Builder {
ctor public WifiOemMigrationHook.ConfigStoreMigrationData.Builder();
method @NonNull public android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData build();
method @NonNull public android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData.Builder setUserSavedNetworkConfigurations(@NonNull java.util.List<android.net.wifi.WifiConfiguration>);
method @NonNull public android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData.Builder setUserSoftApConfiguration(@NonNull android.net.wifi.SoftApConfiguration);
}
public static final class WifiOemMigrationHook.SettingsMigrationData implements android.os.Parcelable {
method public int describeContents();
method @Nullable public String getP2pDeviceName();
method public boolean isP2pFactoryResetPending();
method public boolean isScanAlwaysAvailable();
method public boolean isScanThrottleEnabled();
method public boolean isSoftApTimeoutEnabled();
method public boolean isVerboseLoggingEnabled();
method public boolean isWakeUpEnabled();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiOemMigrationHook.SettingsMigrationData> CREATOR;
}
public static final class WifiOemMigrationHook.SettingsMigrationData.Builder {
ctor public WifiOemMigrationHook.SettingsMigrationData.Builder();
method @NonNull public android.net.wifi.WifiOemMigrationHook.SettingsMigrationData build();
method @NonNull public android.net.wifi.WifiOemMigrationHook.SettingsMigrationData.Builder setP2pDeviceName(@Nullable String);
method @NonNull public android.net.wifi.WifiOemMigrationHook.SettingsMigrationData.Builder setP2pFactoryResetPending(boolean);
method @NonNull public android.net.wifi.WifiOemMigrationHook.SettingsMigrationData.Builder setScanAlwaysAvailable(boolean);
method @NonNull public android.net.wifi.WifiOemMigrationHook.SettingsMigrationData.Builder setScanThrottleEnabled(boolean);
method @NonNull public android.net.wifi.WifiOemMigrationHook.SettingsMigrationData.Builder setSoftApTimeoutEnabled(boolean);
method @NonNull public android.net.wifi.WifiOemMigrationHook.SettingsMigrationData.Builder setVerboseLoggingEnabled(boolean);
method @NonNull public android.net.wifi.WifiOemMigrationHook.SettingsMigrationData.Builder setWakeUpEnabled(boolean);
}
public class WifiScanner {
method @Deprecated public void configureWifiChange(int, int, int, int, int, android.net.wifi.WifiScanner.BssidInfo[]);
method @Deprecated public void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings);

2
wifi/Android.bp
View File

@@ -47,7 +47,7 @@ filegroup {
// framework-wifi.jar. This is not a good idea, should move WifiNetworkScoreCache
// to a separate package.
"java/android/net/wifi/WifiNetworkScoreCache.java",
"java/android/net/wifi/WifiOemMigrationHook.java",
"java/android/net/wifi/WifiMigration.java",
"java/android/net/wifi/nl80211/*.java",
":libwificond_ipc_aidl",
],

4
wifi/java/android/net/wifi/WifiOemMigrationHook.java → wifi/java/android/net/wifi/WifiMigration.java
View File

@@ -34,9 +34,9 @@ import java.util.List;
* @hide
*/
@SystemApi
public final class WifiOemMigrationHook {
public final class WifiMigration {
private WifiOemMigrationHook() { }
private WifiMigration() { }
/**
* Container for all the wifi config data to migrate.