Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6c820b5 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Andrew Sapperstein
Browse files

API Review: TetherNetwork, DeviceInfo 

Renamed TetherNetwork to HotspotNetwork and replaced all usage
of Tether with Hotspot.
Renamed DeviceInfo to NetworkProviderInfo.
Added DEVICE_TYPE_WATCH and DEVICE_TYPE_AUTO for futureproofing
in NetworkProviderInfo.java

Bug: 268486125
Test: atest (all affected test classes)

Change-Id: I889457f02322644f3779bf25c3a125f7f973c69c
parent 44d3fa63

core/api/system-current.txt

+89 −87
Original line number Diff line number Diff line
@@ -10001,34 +10001,65 @@ package android.net.wifi.nl80211 { 














package android.net.wifi.sharedconnectivity.app {



























  public final class DeviceInfo implements android.os.Parcelable {













  public final class HotspotNetwork implements android.os.Parcelable {















    method public int describeContents();













    method @IntRange(from=0, to=100) public int getBatteryPercentage();













    method @IntRange(from=0, to=3) public int getConnectionStrength();













    method @NonNull public String getDeviceName();













    method public int getDeviceType();













    method @NonNull public String getModelName();













    method public long getDeviceId();













    method public int getHostNetworkType();













    method @Nullable public String getHotspotBssid();













    method @NonNull public java.util.Set<java.lang.Integer> getHotspotSecurityTypes();













    method @Nullable public String getHotspotSsid();













    method @NonNull public String getNetworkName();













    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo getNetworkProviderInfo();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.DeviceInfo> CREATOR;













    field public static final int DEVICE_TYPE_LAPTOP = 3; // 0x3













    field public static final int DEVICE_TYPE_PHONE = 1; // 0x1













    field public static final int DEVICE_TYPE_TABLET = 2; // 0x2













    field public static final int DEVICE_TYPE_UNKNOWN = 0; // 0x0













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.HotspotNetwork> CREATOR;













    field public static final int NETWORK_TYPE_CELLULAR = 1; // 0x1













    field public static final int NETWORK_TYPE_ETHERNET = 3; // 0x3













    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0













    field public static final int NETWORK_TYPE_WIFI = 2; // 0x2















  }



























  public static final class DeviceInfo.Builder {













    ctor public DeviceInfo.Builder();













    method @NonNull public android.net.wifi.sharedconnectivity.app.DeviceInfo build();













    method @NonNull public android.net.wifi.sharedconnectivity.app.DeviceInfo.Builder setBatteryPercentage(@IntRange(from=0, to=100) int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.DeviceInfo.Builder setConnectionStrength(@IntRange(from=0, to=3) int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.DeviceInfo.Builder setDeviceName(@NonNull String);













    method @NonNull public android.net.wifi.sharedconnectivity.app.DeviceInfo.Builder setDeviceType(int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.DeviceInfo.Builder setModelName(@NonNull String);













  public static final class HotspotNetwork.Builder {













    ctor public HotspotNetwork.Builder();













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork.Builder addHotspotSecurityType(int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork build();













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork.Builder setDeviceId(long);













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork.Builder setHostNetworkType(int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork.Builder setHotspotBssid(@NonNull String);













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork.Builder setHotspotSsid(@NonNull String);













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork.Builder setNetworkName(@NonNull String);













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork.Builder setNetworkProviderInfo(@NonNull android.net.wifi.sharedconnectivity.app.NetworkProviderInfo);













  }

























  public final class HotspotNetworkConnectionStatus implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public android.os.Bundle getExtras();













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetwork getHotspotNetwork();













    method public int getStatus();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field public static final int CONNECTION_STATUS_CONNECT_TO_HOTSPOT_FAILED = 9; // 0x9













    field public static final int CONNECTION_STATUS_ENABLING_HOTSPOT = 1; // 0x1













    field public static final int CONNECTION_STATUS_ENABLING_HOTSPOT_FAILED = 7; // 0x7













    field public static final int CONNECTION_STATUS_ENABLING_HOTSPOT_TIMEOUT = 8; // 0x8













    field public static final int CONNECTION_STATUS_NO_CELL_DATA = 6; // 0x6













    field public static final int CONNECTION_STATUS_PROVISIONING_FAILED = 3; // 0x3













    field public static final int CONNECTION_STATUS_TETHERING_TIMEOUT = 4; // 0x4













    field public static final int CONNECTION_STATUS_TETHERING_UNSUPPORTED = 5; // 0x5













    field public static final int CONNECTION_STATUS_UNKNOWN = 0; // 0x0













    field public static final int CONNECTION_STATUS_UNKNOWN_ERROR = 2; // 0x2













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus> CREATOR;













  }

























  public static final class HotspotNetworkConnectionStatus.Builder {













    ctor public HotspotNetworkConnectionStatus.Builder();













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus build();













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus.Builder setExtras(@NonNull android.os.Bundle);













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus.Builder setHotspotNetwork(@NonNull android.net.wifi.sharedconnectivity.app.HotspotNetwork);













    method @NonNull public android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus.Builder setStatus(int);















  }





























  public final class KnownNetwork implements android.os.Parcelable {















    method public int describeContents();













    method @Nullable public android.net.wifi.sharedconnectivity.app.DeviceInfo getDeviceInfo();













    method @Nullable public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo getNetworkProviderInfo();















    method public int getNetworkSource();















    method @NonNull public java.util.Set<java.lang.Integer> getSecurityTypes();















    method @NonNull public String getSsid();









@@ -10043,7 +10074,7 @@ package android.net.wifi.sharedconnectivity.app {













    ctor public KnownNetwork.Builder();















    method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetwork.Builder addSecurityType(int);















    method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetwork build();













    method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetwork.Builder setDeviceInfo(@Nullable android.net.wifi.sharedconnectivity.app.DeviceInfo);













    method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetwork.Builder setNetworkProviderInfo(@Nullable android.net.wifi.sharedconnectivity.app.NetworkProviderInfo);















    method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetwork.Builder setNetworkSource(int);















    method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetwork.Builder setSsid(@NonNull String);















  }









@@ -10068,27 +10099,54 @@ package android.net.wifi.sharedconnectivity.app {













    method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus.Builder setStatus(int);















  }



























  public final class NetworkProviderInfo implements android.os.Parcelable {













    method public int describeContents();













    method @IntRange(from=0, to=100) public int getBatteryPercentage();













    method @IntRange(from=0, to=3) public int getConnectionStrength();













    method @NonNull public String getDeviceName();













    method public int getDeviceType();













    method @NonNull public String getModelName();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.NetworkProviderInfo> CREATOR;













    field public static final int DEVICE_TYPE_AUTO = 5; // 0x5













    field public static final int DEVICE_TYPE_LAPTOP = 3; // 0x3













    field public static final int DEVICE_TYPE_PHONE = 1; // 0x1













    field public static final int DEVICE_TYPE_TABLET = 2; // 0x2













    field public static final int DEVICE_TYPE_UNKNOWN = 0; // 0x0













    field public static final int DEVICE_TYPE_WATCH = 4; // 0x4













  }

























  public static final class NetworkProviderInfo.Builder {













    ctor public NetworkProviderInfo.Builder();













    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo build();













    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryPercentage(@IntRange(from=0, to=100) int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setConnectionStrength(@IntRange(from=0, to=3) int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setDeviceName(@NonNull String);













    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setDeviceType(int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setModelName(@NonNull String);













  }



























  public interface SharedConnectivityClientCallback {













    method public void onHotspotNetworkConnectionStatusChanged(@NonNull android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus);













    method public void onHotspotNetworksUpdated(@NonNull java.util.List<android.net.wifi.sharedconnectivity.app.HotspotNetwork>);















    method public void onKnownNetworkConnectionStatusChanged(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus);















    method public void onKnownNetworksUpdated(@NonNull java.util.List<android.net.wifi.sharedconnectivity.app.KnownNetwork>);















    method public void onRegisterCallbackFailed(@NonNull Exception);















    method public void onServiceConnected();















    method public void onServiceDisconnected();















    method public void onSharedConnectivitySettingsChanged(@NonNull android.net.wifi.sharedconnectivity.app.SharedConnectivitySettingsState);













    method public void onTetherNetworkConnectionStatusChanged(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus);













    method public void onTetherNetworksUpdated(@NonNull java.util.List<android.net.wifi.sharedconnectivity.app.TetherNetwork>);















  }





























  public class SharedConnectivityManager {













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean connectHotspotNetwork(@NonNull android.net.wifi.sharedconnectivity.app.HotspotNetwork);















    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean connectKnownNetwork(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetwork);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean connectTetherNetwork(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetwork);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean disconnectTetherNetwork(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetwork);













    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean disconnectHotspotNetwork(@NonNull android.net.wifi.sharedconnectivity.app.HotspotNetwork);















    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean forgetKnownNetwork(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetwork);













    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus getHotspotNetworkConnectionStatus();













    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.sharedconnectivity.app.HotspotNetwork> getHotspotNetworks();















    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus getKnownNetworkConnectionStatus();















    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.sharedconnectivity.app.KnownNetwork> getKnownNetworks();















    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.wifi.sharedconnectivity.app.SharedConnectivitySettingsState getSettingsState();













    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus getTetherNetworkConnectionStatus();













    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.sharedconnectivity.app.TetherNetwork> getTetherNetworks();















    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.sharedconnectivity.app.SharedConnectivityClientCallback);















    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean unregisterCallback(@NonNull android.net.wifi.sharedconnectivity.app.SharedConnectivityClientCallback);















  }









@@ -10108,62 +10166,6 @@ package android.net.wifi.sharedconnectivity.app {













    method @NonNull public android.net.wifi.sharedconnectivity.app.SharedConnectivitySettingsState.Builder setInstantTetherEnabled(boolean);















  }



























  public final class TetherNetwork implements android.os.Parcelable {













    method public int describeContents();













    method public long getDeviceId();













    method @NonNull public android.net.wifi.sharedconnectivity.app.DeviceInfo getDeviceInfo();













    method @Nullable public String getHotspotBssid();













    method @NonNull public java.util.Set<java.lang.Integer> getHotspotSecurityTypes();













    method @Nullable public String getHotspotSsid();













    method @NonNull public String getNetworkName();













    method public int getNetworkType();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.TetherNetwork> CREATOR;













    field public static final int NETWORK_TYPE_CELLULAR = 1; // 0x1













    field public static final int NETWORK_TYPE_ETHERNET = 3; // 0x3













    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0













    field public static final int NETWORK_TYPE_WIFI = 2; // 0x2













  }

























  public static final class TetherNetwork.Builder {













    ctor public TetherNetwork.Builder();













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork.Builder addHotspotSecurityType(int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork build();













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork.Builder setDeviceId(long);













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork.Builder setDeviceInfo(@NonNull android.net.wifi.sharedconnectivity.app.DeviceInfo);













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork.Builder setHotspotBssid(@NonNull String);













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork.Builder setHotspotSsid(@NonNull String);













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork.Builder setNetworkName(@NonNull String);













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork.Builder setNetworkType(int);













  }

























  public final class TetherNetworkConnectionStatus implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public android.os.Bundle getExtras();













    method public int getStatus();













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork getTetherNetwork();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field public static final int CONNECTION_STATUS_CONNECT_TO_HOTSPOT_FAILED = 9; // 0x9













    field public static final int CONNECTION_STATUS_ENABLING_HOTSPOT = 1; // 0x1













    field public static final int CONNECTION_STATUS_ENABLING_HOTSPOT_FAILED = 7; // 0x7













    field public static final int CONNECTION_STATUS_ENABLING_HOTSPOT_TIMEOUT = 8; // 0x8













    field public static final int CONNECTION_STATUS_NO_CELL_DATA = 6; // 0x6













    field public static final int CONNECTION_STATUS_PROVISIONING_FAILED = 3; // 0x3













    field public static final int CONNECTION_STATUS_TETHERING_TIMEOUT = 4; // 0x4













    field public static final int CONNECTION_STATUS_TETHERING_UNSUPPORTED = 5; // 0x5













    field public static final int CONNECTION_STATUS_UNKNOWN = 0; // 0x0













    field public static final int CONNECTION_STATUS_UNKNOWN_ERROR = 2; // 0x2













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus> CREATOR;













  }

























  public static final class TetherNetworkConnectionStatus.Builder {













    ctor public TetherNetworkConnectionStatus.Builder();













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus build();













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus.Builder setExtras(@NonNull android.os.Bundle);













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus.Builder setStatus(int);













    method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus.Builder setTetherNetwork(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetwork);













  }



























}





























package android.net.wifi.sharedconnectivity.service {









@@ -10171,15 +10173,15 @@ package android.net.wifi.sharedconnectivity.service {













  public abstract class SharedConnectivityService extends android.app.Service {















    ctor public SharedConnectivityService();















    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);













    method public abstract void onConnectHotspotNetwork(@NonNull android.net.wifi.sharedconnectivity.app.HotspotNetwork);















    method public abstract void onConnectKnownNetwork(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetwork);













    method public abstract void onConnectTetherNetwork(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetwork);













    method public abstract void onDisconnectTetherNetwork(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetwork);













    method public abstract void onDisconnectHotspotNetwork(@NonNull android.net.wifi.sharedconnectivity.app.HotspotNetwork);















    method public abstract void onForgetKnownNetwork(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetwork);













    method public final void setHotspotNetworks(@NonNull java.util.List<android.net.wifi.sharedconnectivity.app.HotspotNetwork>);















    method public final void setKnownNetworks(@NonNull java.util.List<android.net.wifi.sharedconnectivity.app.KnownNetwork>);















    method public final void setSettingsState(@NonNull android.net.wifi.sharedconnectivity.app.SharedConnectivitySettingsState);













    method public final void setTetherNetworks(@NonNull java.util.List<android.net.wifi.sharedconnectivity.app.TetherNetwork>);













    method public final void updateHotspotNetworkConnectionStatus(@NonNull android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus);















    method public final void updateKnownNetworkConnectionStatus(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus);













    method public final void updateTetherNetworkConnectionStatus(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus);















  }





























}

























wifi/java/src/android/net/wifi/sharedconnectivity/app/DeviceInfo.aidl→wifi/java/src/android/net/wifi/sharedconnectivity/app/HotspotNetwork.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -16,4 +16,4 @@





























package android.net.wifi.sharedconnectivity.app;





























parcelable DeviceInfo;










 No newline at end of file












parcelable HotspotNetwork;
























wifi/java/src/android/net/wifi/sharedconnectivity/app/TetherNetwork.java→wifi/java/src/android/net/wifi/sharedconnectivity/app/HotspotNetwork.java



+59
−48


























File changed and moved.
Preview size limit exceeded, changes collapsed.
























wifi/java/src/android/net/wifi/sharedconnectivity/app/TetherNetworkConnectionStatus.aidl→wifi/java/src/android/net/wifi/sharedconnectivity/app/HotspotNetworkConnectionStatus.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -16,4 +16,4 @@





























package android.net.wifi.sharedconnectivity.app;





























parcelable TetherNetworkConnectionStatus;












parcelable HotspotNetworkConnectionStatus;
























wifi/java/src/android/net/wifi/sharedconnectivity/app/TetherNetworkConnectionStatus.java→wifi/java/src/android/net/wifi/sharedconnectivity/app/HotspotNetworkConnectionStatus.java



+43
−41


























File changed and moved.
Preview size limit exceeded, changes collapsed.