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

Commit 180aa390 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Automerger Merge Worker
Browse files

Merge "Add extras parameter to rest of data classes" into udc-dev am: b274394e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22086092



Change-Id: I961a27a16bfb8df975aee6d2adc426eb647ba4f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3630332c b274394e

core/api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -9984,6 +9984,7 @@ package android.net.wifi.sharedconnectivity.app { 
  public final class HotspotNetwork implements android.os.Parcelable {

    method public int describeContents();

    method public long getDeviceId();

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

    method public int getHostNetworkType();

    method @Nullable public String getHotspotBssid();

    method @NonNull public java.util.Set<java.lang.Integer> getHotspotSecurityTypes();
@@ -10003,6 +10004,7 @@ package android.net.wifi.sharedconnectivity.app { 
    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 setExtras(@NonNull android.os.Bundle);

    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);
@@ -10039,6 +10041,7 @@ package android.net.wifi.sharedconnectivity.app { 














  public final class KnownNetwork implements android.os.Parcelable {















    method public int describeContents();













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















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















    method public int getNetworkSource();















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









@@ -10054,6 +10057,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 setExtras(@NonNull android.os.Bundle);















    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);










@@ -10085,6 +10089,7 @@ package android.net.wifi.sharedconnectivity.app {













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















    method @NonNull public String getDeviceName();















    method public int getDeviceType();













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















    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;









@@ -10103,6 +10108,7 @@ package android.net.wifi.sharedconnectivity.app {













    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 setExtras(@NonNull android.os.Bundle);















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















  }







































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



+33
−5




























Original line number
Diff line number
Diff line








@@ -23,6 +23,7 @@ import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.SystemApi;















import android.net.wifi.sharedconnectivity.service.SharedConnectivityService;













import android.os.Bundle;















import android.os.Parcel;















import android.os.Parcelable;















import android.util.ArraySet;










@@ -86,6 +87,7 @@ public final class HotspotNetwork implements Parcelable {













    @Nullable















    @SecurityType















    private final ArraySet<Integer> mHotspotSecurityTypes;













    private final Bundle mExtras;































    /**















     * Builder class for {@link HotspotNetwork}.









@@ -102,8 +104,8 @@ public final class HotspotNetwork implements Parcelable {













        private String mHotspotBssid;















        @Nullable















        @SecurityType













        private final ArraySet<Integer> mHotspotSecurityTypes =













                new ArraySet<>();













        private final ArraySet<Integer> mHotspotSecurityTypes = new ArraySet<>();













        private Bundle mExtras = Bundle.EMPTY;































        /**















         * Set the remote device ID.










@@ -189,6 +191,17 @@ public final class HotspotNetwork implements Parcelable {













            return this;















        }





























        /**













         * Sets the extras bundle













         *













         * @return Returns the Builder object.













         */













        @NonNull













        public Builder setExtras(@NonNull Bundle extras) {













            mExtras = extras;













            return this;













        }





























        /**















         * Builds the {@link HotspotNetwork} object.















         *









@@ -203,7 +216,8 @@ public final class HotspotNetwork implements Parcelable {













                    mNetworkName,















                    mHotspotSsid,















                    mHotspotBssid,













                    mHotspotSecurityTypes);













                    mHotspotSecurityTypes,













                    mExtras);















        }















    }


























@@ -231,7 +245,8 @@ public final class HotspotNetwork implements Parcelable {













            @NonNull String networkName,















            @Nullable String hotspotSsid,















            @Nullable String hotspotBssid,













            @Nullable @SecurityType ArraySet<Integer> hotspotSecurityTypes) {













            @Nullable @SecurityType ArraySet<Integer> hotspotSecurityTypes,













            @NonNull Bundle extras) {















        validate(deviceId,















                networkType,















                networkName,









@@ -243,6 +258,7 @@ public final class HotspotNetwork implements Parcelable {













        mHotspotSsid = hotspotSsid;















        mHotspotBssid = hotspotBssid;















        mHotspotSecurityTypes = new ArraySet<>(hotspotSecurityTypes);













        mExtras = extras;















    }































    /**










@@ -315,6 +331,16 @@ public final class HotspotNetwork implements Parcelable {













        return mHotspotSecurityTypes;















    }





























    /**













     * Gets the extras Bundle.













     *













     * @return Returns a Bundle object.













     */













    @NonNull













    public Bundle getExtras() {













        return mExtras;













    }





























    @Override















    public boolean equals(Object obj) {















        if (!(obj instanceof HotspotNetwork)) return false;










@@ -348,6 +374,7 @@ public final class HotspotNetwork implements Parcelable {













        dest.writeString(mHotspotSsid);















        dest.writeString(mHotspotBssid);















        dest.writeArraySet(mHotspotSecurityTypes);













        dest.writeBundle(mExtras);















    }































    /**









@@ -359,7 +386,7 @@ public final class HotspotNetwork implements Parcelable {













    public static HotspotNetwork readFromParcel(@NonNull Parcel in) {















        return new HotspotNetwork(in.readLong(), NetworkProviderInfo.readFromParcel(in),















                in.readInt(), in.readString(), in.readString(), in.readString(),













                (ArraySet<Integer>) in.readArraySet(null));













                (ArraySet<Integer>) in.readArraySet(null), in.readBundle());















    }































    @NonNull









@@ -385,6 +412,7 @@ public final class HotspotNetwork implements Parcelable {













                .append(", hotspotSsid=").append(mHotspotSsid)















                .append(", hotspotBssid=").append(mHotspotBssid)















                .append(", hotspotSecurityTypes=").append(mHotspotSecurityTypes.toString())













                .append(", extras=").append(mExtras.toString())















                .append("]").toString();















    }















}
























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



+2
−2




























Original line number
Diff line number
Diff line








@@ -117,7 +117,7 @@ public final class HotspotNetworkConnectionStatus implements Parcelable {













        @ConnectionStatus















        private int mStatus;















        private HotspotNetwork mHotspotNetwork;













        private Bundle mExtras;













        private Bundle mExtras = Bundle.EMPTY;































        /**















         * Sets the status of the connection










@@ -179,7 +179,7 @@ public final class HotspotNetworkConnectionStatus implements Parcelable {













    }































    private HotspotNetworkConnectionStatus(@ConnectionStatus int status,













            HotspotNetwork hotspotNetwork, Bundle extras) {













            HotspotNetwork hotspotNetwork, @NonNull Bundle extras) {















        validate(status);















        mStatus = status;















        mHotspotNetwork = hotspotNetwork;

































wifi/java/src/android/net/wifi/sharedconnectivity/app/KnownNetwork.java



+32
−3




























Original line number
Diff line number
Diff line








@@ -22,6 +22,7 @@ import android.annotation.IntDef;













import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.SystemApi;













import android.os.Bundle;















import android.os.Parcel;















import android.os.Parcelable;















import android.text.TextUtils;










@@ -73,6 +74,7 @@ public final class KnownNetwork implements Parcelable {













    @SecurityType















    private final ArraySet<Integer> mSecurityTypes;















    private final NetworkProviderInfo mNetworkProviderInfo;













    private final Bundle mExtras;































    /**















     * Builder class for {@link KnownNetwork}.









@@ -84,6 +86,7 @@ public final class KnownNetwork implements Parcelable {













        @SecurityType















        private final ArraySet<Integer> mSecurityTypes = new ArraySet<>();















        private NetworkProviderInfo mNetworkProviderInfo;













        private Bundle mExtras = Bundle.EMPTY;































        /**















         * Sets the indicated source of the known network.










@@ -134,6 +137,17 @@ public final class KnownNetwork implements Parcelable {













            return this;















        }





























        /**













         * Sets the extras bundle













         *













         * @return Returns the Builder object.













         */













        @NonNull













        public Builder setExtras(@NonNull Bundle extras) {













            mExtras = extras;













            return this;













        }





























        /**















         * Builds the {@link KnownNetwork} object.















         *









@@ -145,7 +159,8 @@ public final class KnownNetwork implements Parcelable {













                    mNetworkSource,















                    mSsid,















                    mSecurityTypes,













                    mNetworkProviderInfo);













                    mNetworkProviderInfo,













                    mExtras);















        }















    }


























@@ -173,12 +188,14 @@ public final class KnownNetwork implements Parcelable {













            @NetworkSource int networkSource,















            @NonNull String ssid,















            @NonNull @SecurityType ArraySet<Integer> securityTypes,













            @Nullable NetworkProviderInfo networkProviderInfo) {













            @Nullable NetworkProviderInfo networkProviderInfo,













            @NonNull Bundle extras) {















        validate(networkSource, ssid, securityTypes, networkProviderInfo);















        mNetworkSource = networkSource;















        mSsid = ssid;















        mSecurityTypes = new ArraySet<>(securityTypes);















        mNetworkProviderInfo = networkProviderInfo;













        mExtras = extras;















    }































    /**










@@ -223,6 +240,16 @@ public final class KnownNetwork implements Parcelable {













        return mNetworkProviderInfo;















    }





























    /**













     * Gets the extras Bundle.













     *













     * @return Returns a Bundle object.













     */













    @NonNull













    public Bundle getExtras() {













        return mExtras;













    }





























    @Override















    public boolean equals(Object obj) {















        if (!(obj instanceof KnownNetwork)) return false;









@@ -249,6 +276,7 @@ public final class KnownNetwork implements Parcelable {













        dest.writeString(mSsid);















        dest.writeArraySet(mSecurityTypes);















        mNetworkProviderInfo.writeToParcel(dest, flags);













        dest.writeBundle(mExtras);















    }































    /**









@@ -260,7 +288,7 @@ public final class KnownNetwork implements Parcelable {













    public static KnownNetwork readFromParcel(@NonNull Parcel in) {















        return new KnownNetwork(in.readInt(), in.readString(),















                (ArraySet<Integer>) in.readArraySet(null),













                NetworkProviderInfo.readFromParcel(in));













                NetworkProviderInfo.readFromParcel(in), in.readBundle());















    }































    @NonNull









@@ -283,6 +311,7 @@ public final class KnownNetwork implements Parcelable {













                .append(", ssid=").append(mSsid)















                .append(", securityTypes=").append(mSecurityTypes.toString())















                .append(", networkProviderInfo=").append(mNetworkProviderInfo.toString())













                .append(", extras=").append(mExtras.toString())















                .append("]").toString();















    }















}
























wifi/java/src/android/net/wifi/sharedconnectivity/app/KnownNetworkConnectionStatus.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -72,7 +72,7 @@ public final class KnownNetworkConnectionStatus implements Parcelable {













    public static final class Builder {















        @ConnectionStatus private int mStatus;















        private KnownNetwork mKnownNetwork;













        private Bundle mExtras;













        private Bundle mExtras = Bundle.EMPTY;































        public Builder() {}


























@@ -128,7 +128,7 @@ public final class KnownNetworkConnectionStatus implements Parcelable {













    }































    private KnownNetworkConnectionStatus(@ConnectionStatus int status, KnownNetwork knownNetwork,













            Bundle extras) {













            @NonNull Bundle extras) {















        validate(status);















        mStatus = status;















        mKnownNetwork = knownNetwork;