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

Commit 5e01b0d8 authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Rename SliceInfo to NetworkSliceInfo." into sc-dev am: 463ec227 

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

Change-Id: I45b1ab49d72038bdf7b8192fec2fe468e872cf13
parents 23871a07 463ec227

core/api/system-current.txt

+28 −28
Original line number Diff line number Diff line
@@ -12043,7 +12043,7 @@ package android.telephony.data { 
    method public int getPduSessionId();

    method public int getProtocolType();

    method public long getRetryDurationMillis();

    method @Nullable public android.telephony.data.SliceInfo getSliceInfo();

    method @Nullable public android.telephony.data.NetworkSliceInfo getSliceInfo();

    method @Deprecated public int getSuggestedRetryTime();

    method @NonNull public java.util.List<android.telephony.data.TrafficDescriptor> getTrafficDescriptors();

    method public void writeToParcel(android.os.Parcel, int);
@@ -12079,7 +12079,7 @@ package android.telephony.data { 
    method @NonNull public android.telephony.data.DataCallResponse.Builder setPduSessionId(@IntRange(from=android.telephony.data.DataCallResponse.PDU_SESSION_ID_NOT_SET, to=15) int);

    method @NonNull public android.telephony.data.DataCallResponse.Builder setProtocolType(int);

    method @NonNull public android.telephony.data.DataCallResponse.Builder setRetryDurationMillis(long);

    method @NonNull public android.telephony.data.DataCallResponse.Builder setSliceInfo(@Nullable android.telephony.data.SliceInfo);

    method @NonNull public android.telephony.data.DataCallResponse.Builder setSliceInfo(@Nullable android.telephony.data.NetworkSliceInfo);

    method @Deprecated @NonNull public android.telephony.data.DataCallResponse.Builder setSuggestedRetryTime(int);

    method @NonNull public android.telephony.data.DataCallResponse.Builder setTrafficDescriptors(@NonNull java.util.List<android.telephony.data.TrafficDescriptor>);

  }
@@ -12152,7 +12152,7 @@ package android.telephony.data { 
    method public void setDataProfile(@NonNull java.util.List<android.telephony.data.DataProfile>, boolean, @NonNull android.telephony.data.DataServiceCallback);

    method public void setInitialAttachApn(@NonNull android.telephony.data.DataProfile, boolean, @NonNull android.telephony.data.DataServiceCallback);

    method public void setupDataCall(int, @NonNull android.telephony.data.DataProfile, boolean, boolean, int, @Nullable android.net.LinkProperties, @NonNull android.telephony.data.DataServiceCallback);

    method public void setupDataCall(int, @NonNull android.telephony.data.DataProfile, boolean, boolean, int, @Nullable android.net.LinkProperties, @IntRange(from=0, to=15) int, @Nullable android.telephony.data.SliceInfo, @Nullable android.telephony.data.TrafficDescriptor, boolean, @NonNull android.telephony.data.DataServiceCallback);

    method public void setupDataCall(int, @NonNull android.telephony.data.DataProfile, boolean, boolean, int, @Nullable android.net.LinkProperties, @IntRange(from=0, to=15) int, @Nullable android.telephony.data.NetworkSliceInfo, @Nullable android.telephony.data.TrafficDescriptor, boolean, @NonNull android.telephony.data.DataServiceCallback);

  }









  public class DataServiceCallback {








@@ -12182,28 +12182,14 @@ package android.telephony.data {







    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.EpsBearerQosSessionAttributes> CREATOR;









  }

















  public abstract class QualifiedNetworksService extends android.app.Service {









    ctor public QualifiedNetworksService();









    method @NonNull public abstract android.telephony.data.QualifiedNetworksService.NetworkAvailabilityProvider onCreateNetworkAvailabilityProvider(int);









    field public static final String QUALIFIED_NETWORKS_SERVICE_INTERFACE = "android.telephony.data.QualifiedNetworksService";









  }

















  public abstract class QualifiedNetworksService.NetworkAvailabilityProvider implements java.lang.AutoCloseable {









    ctor public QualifiedNetworksService.NetworkAvailabilityProvider(int);









    method public abstract void close();









    method public final int getSlotIndex();









    method public void reportThrottleStatusChanged(@NonNull java.util.List<android.telephony.data.ThrottleStatus>);









    method public final void updateQualifiedNetworkTypes(int, @NonNull java.util.List<java.lang.Integer>);









  }

















  public final class SliceInfo implements android.os.Parcelable {









  public final class NetworkSliceInfo implements android.os.Parcelable {









    method public int describeContents();









    method @IntRange(from=android.telephony.data.SliceInfo.MIN_SLICE_DIFFERENTIATOR, to=android.telephony.data.SliceInfo.MAX_SLICE_DIFFERENTIATOR) public int getMappedHplmnSliceDifferentiator();









    method @IntRange(from=android.telephony.data.NetworkSliceInfo.MIN_SLICE_DIFFERENTIATOR, to=android.telephony.data.NetworkSliceInfo.MAX_SLICE_DIFFERENTIATOR) public int getMappedHplmnSliceDifferentiator();









    method public int getMappedHplmnSliceServiceType();









    method @IntRange(from=android.telephony.data.SliceInfo.MIN_SLICE_DIFFERENTIATOR, to=android.telephony.data.SliceInfo.MAX_SLICE_DIFFERENTIATOR) public int getSliceDifferentiator();









    method @IntRange(from=android.telephony.data.NetworkSliceInfo.MIN_SLICE_DIFFERENTIATOR, to=android.telephony.data.NetworkSliceInfo.MAX_SLICE_DIFFERENTIATOR) public int getSliceDifferentiator();









    method public int getSliceServiceType();









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









    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.SliceInfo> CREATOR;









    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.NetworkSliceInfo> CREATOR;









    field public static final int MAX_SLICE_DIFFERENTIATOR = 16777214; // 0xfffffe









    field public static final int MIN_SLICE_DIFFERENTIATOR = -1; // 0xffffffff









    field public static final int SLICE_DIFFERENTIATOR_NO_SLICE = -1; // 0xffffffff








@@ -12213,13 +12199,27 @@ package android.telephony.data {







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









  }

















  public static final class SliceInfo.Builder {









    ctor public SliceInfo.Builder();









    method @NonNull public android.telephony.data.SliceInfo build();









    method @NonNull public android.telephony.data.SliceInfo.Builder setMappedHplmnSliceDifferentiator(@IntRange(from=android.telephony.data.SliceInfo.MIN_SLICE_DIFFERENTIATOR, to=android.telephony.data.SliceInfo.MAX_SLICE_DIFFERENTIATOR) int);









    method @NonNull public android.telephony.data.SliceInfo.Builder setMappedHplmnSliceServiceType(int);









    method @NonNull public android.telephony.data.SliceInfo.Builder setSliceDifferentiator(@IntRange(from=android.telephony.data.SliceInfo.MIN_SLICE_DIFFERENTIATOR, to=android.telephony.data.SliceInfo.MAX_SLICE_DIFFERENTIATOR) int);









    method @NonNull public android.telephony.data.SliceInfo.Builder setSliceServiceType(int);









  public static final class NetworkSliceInfo.Builder {









    ctor public NetworkSliceInfo.Builder();









    method @NonNull public android.telephony.data.NetworkSliceInfo build();









    method @NonNull public android.telephony.data.NetworkSliceInfo.Builder setMappedHplmnSliceDifferentiator(@IntRange(from=android.telephony.data.NetworkSliceInfo.MIN_SLICE_DIFFERENTIATOR, to=android.telephony.data.NetworkSliceInfo.MAX_SLICE_DIFFERENTIATOR) int);









    method @NonNull public android.telephony.data.NetworkSliceInfo.Builder setMappedHplmnSliceServiceType(int);









    method @NonNull public android.telephony.data.NetworkSliceInfo.Builder setSliceDifferentiator(@IntRange(from=android.telephony.data.NetworkSliceInfo.MIN_SLICE_DIFFERENTIATOR, to=android.telephony.data.NetworkSliceInfo.MAX_SLICE_DIFFERENTIATOR) int);









    method @NonNull public android.telephony.data.NetworkSliceInfo.Builder setSliceServiceType(int);









  }

















  public abstract class QualifiedNetworksService extends android.app.Service {









    ctor public QualifiedNetworksService();









    method @NonNull public abstract android.telephony.data.QualifiedNetworksService.NetworkAvailabilityProvider onCreateNetworkAvailabilityProvider(int);









    field public static final String QUALIFIED_NETWORKS_SERVICE_INTERFACE = "android.telephony.data.QualifiedNetworksService";









  }

















  public abstract class QualifiedNetworksService.NetworkAvailabilityProvider implements java.lang.AutoCloseable {









    ctor public QualifiedNetworksService.NetworkAvailabilityProvider(int);









    method public abstract void close();









    method public final int getSlotIndex();









    method public void reportThrottleStatusChanged(@NonNull java.util.List<android.telephony.data.ThrottleStatus>);









    method public final void updateQualifiedNetworkTypes(int, @NonNull java.util.List<java.lang.Integer>);









  }

















  public final class ThrottleStatus implements android.os.Parcelable {

























telephony/java/android/telephony/data/DataCallResponse.java



+8
−7






























Original line number
Diff line number
Diff line







@@ -139,7 +139,7 @@ public final class DataCallResponse implements Parcelable {







    private final int mPduSessionId;









    private final Qos mDefaultQos;









    private final List<QosBearerSession> mQosBearerSessions;









    private final SliceInfo mSliceInfo;









    private final NetworkSliceInfo mSliceInfo;









    private final List<TrafficDescriptor> mTrafficDescriptors;



















    /**








@@ -202,7 +202,8 @@ public final class DataCallResponse implements Parcelable {







            @Nullable List<InetAddress> pcscfAddresses, int mtu, int mtuV4, int mtuV6,









            @HandoverFailureMode int handoverFailureMode, int pduSessionId,









            @Nullable Qos defaultQos, @Nullable List<QosBearerSession> qosBearerSessions,









            @Nullable SliceInfo sliceInfo, @Nullable List<TrafficDescriptor> trafficDescriptors) {









            @Nullable NetworkSliceInfo sliceInfo,









            @Nullable List<TrafficDescriptor> trafficDescriptors) {









        mCause = cause;









        mSuggestedRetryTime = suggestedRetryTime;









        mId = id;








@@ -255,7 +256,7 @@ public final class DataCallResponse implements Parcelable {







        mDefaultQos = source.readParcelable(Qos.class.getClassLoader());









        mQosBearerSessions = new ArrayList<>();









        source.readList(mQosBearerSessions, QosBearerSession.class.getClassLoader());









        mSliceInfo = source.readParcelable(SliceInfo.class.getClassLoader());









        mSliceInfo = source.readParcelable(NetworkSliceInfo.class.getClassLoader());









        mTrafficDescriptors = new ArrayList<>();









        source.readList(mTrafficDescriptors, TrafficDescriptor.class.getClassLoader());









    }








@@ -410,7 +411,7 @@ public final class DataCallResponse implements Parcelable {







     * @return The slice info related to this data connection.









     */









    @Nullable









    public SliceInfo getSliceInfo() {









    public NetworkSliceInfo getSliceInfo() {









        return mSliceInfo;









    }


















@@ -626,7 +627,7 @@ public final class DataCallResponse implements Parcelable {

















        private List<QosBearerSession> mQosBearerSessions = new ArrayList<>();



















        private SliceInfo mSliceInfo;









        private NetworkSliceInfo mSliceInfo;



















        private List<TrafficDescriptor> mTrafficDescriptors = new ArrayList<>();


















@@ -865,13 +866,13 @@ public final class DataCallResponse implements Parcelable {







         * The Slice used for this data connection.









         * <p/>









         * If a handover occurs from EPDG to 5G,









         * this is the {@link SliceInfo} used in {@link DataService#setupDataCall}.









         * this is the {@link NetworkSliceInfo} used in {@link DataService#setupDataCall}.









         *









         * @param sliceInfo the slice info for the data call









         *









         * @return The same instance of the builder.









         */









        public @NonNull Builder setSliceInfo(@Nullable SliceInfo sliceInfo) {









        public @NonNull Builder setSliceInfo(@Nullable NetworkSliceInfo sliceInfo) {









            mSliceInfo = sliceInfo;









            return this;









        }
































telephony/java/android/telephony/data/DataService.java



+4
−4






























Original line number
Diff line number
Diff line







@@ -218,7 +218,7 @@ public abstract class DataService extends Service {







                boolean isRoaming, boolean allowRoaming,









                @SetupDataReason int reason,









                @Nullable LinkProperties linkProperties,









                @IntRange(from = 0, to = 15) int pduSessionId, @Nullable SliceInfo sliceInfo,









                @IntRange(from = 0, to = 15) int pduSessionId, @Nullable NetworkSliceInfo sliceInfo,









                @Nullable TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed,









                @NonNull DataServiceCallback callback) {









            /* Call the old version since the new version isn't supported */








@@ -418,13 +418,13 @@ public abstract class DataService extends Service {







        public final int reason;









        public final LinkProperties linkProperties;









        public final int pduSessionId;









        public final SliceInfo sliceInfo;









        public final NetworkSliceInfo sliceInfo;









        public final TrafficDescriptor trafficDescriptor;









        public final boolean matchAllRuleAllowed;









        public final IDataServiceCallback callback;









        SetupDataCallRequest(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,









                boolean allowRoaming, int reason, LinkProperties linkProperties, int pduSessionId,









                SliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,









                NetworkSliceInfo sliceInfo, TrafficDescriptor trafficDescriptor,









                boolean matchAllRuleAllowed, IDataServiceCallback callback) {









            this.accessNetworkType = accessNetworkType;









            this.dataProfile = dataProfile;








@@ -711,7 +711,7 @@ public abstract class DataService extends Service {







        @Override









        public void setupDataCall(int slotIndex, int accessNetworkType, DataProfile dataProfile,









                boolean isRoaming, boolean allowRoaming, int reason,









                LinkProperties linkProperties, int pduSessionId, SliceInfo sliceInfo,









                LinkProperties linkProperties, int pduSessionId, NetworkSliceInfo sliceInfo,









                TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed,









                IDataServiceCallback callback) {









            mHandler.obtainMessage(DATA_SERVICE_REQUEST_SETUP_DATA_CALL, slotIndex, 0,
































telephony/java/android/telephony/data/IDataService.aidl



+2
−2






























Original line number
Diff line number
Diff line







@@ -19,7 +19,7 @@ package android.telephony.data;







import android.net.LinkProperties;









import android.telephony.data.DataProfile;









import android.telephony.data.IDataServiceCallback;









import android.telephony.data.SliceInfo;









import android.telephony.data.NetworkSliceInfo;









import android.telephony.data.TrafficDescriptor;



















/**








@@ -31,7 +31,7 @@ oneway interface IDataService







    void removeDataServiceProvider(int slotId);









    void setupDataCall(int slotId, int accessNetwork, in DataProfile dataProfile, boolean isRoaming,









                       boolean allowRoaming, int reason, in LinkProperties linkProperties,









                       int pduSessionId, in SliceInfo sliceInfo,









                       int pduSessionId, in NetworkSliceInfo sliceInfo,









                       in TrafficDescriptor trafficDescriptor, boolean matchAllRuleAllowed,









                       IDataServiceCallback callback);









    void deactivateDataCall(int slotId, int cid, int reason, IDataServiceCallback callback);
































telephony/java/android/telephony/data/SliceInfo.aidl→telephony/java/android/telephony/data/NetworkSliceInfo.aidl



+1
−1






























Original line number
Diff line number
Diff line







@@ -17,4 +17,4 @@







/** @hide */









package android.telephony.data;



















parcelable SliceInfo;








parcelable NetworkSliceInfo;