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

Commit dba10320 authored by Jack Yu's avatar Jack Yu
Browse files

Renamed DataSpecificRegistrationState 

Renamed DataSpecificRegistrationState to
DataSpecificRegistrationInfo. And added some
APIs to test API so they can be accessed by
CTS.

Test: Manual
Bug: 127657991
Change-Id: I1a623c18f02cfd19ca1af9df912d859b363f42d1
parent dc6c7db5

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -7558,11 +7558,11 @@ package android.telephony { 
    field public static final int VSNCP_TIMEOUT = 2236; // 0x8bc

  }













  public final class DataSpecificRegistrationStates implements android.os.Parcelable {













  public final class DataSpecificRegistrationInfo implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo();















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













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













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















  }





























  public final class DisconnectCause {










@@ -7671,7 +7671,7 @@ package android.telephony {













    method public int getAccessNetworkTechnology();















    method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();















    method @Nullable public android.telephony.CellIdentity getCellIdentity();













    method @Nullable public android.telephony.DataSpecificRegistrationStates getDataSpecificStates();













    method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();















    method public int getDomain();















    method public int getRegistrationState();















    method public int getRejectCause();

























api/test-current.txt



+69
−0




























Original line number
Diff line number
Diff line








@@ -2552,10 +2552,34 @@ package android.telecom {





























package android.telephony {





























  public final class AccessNetworkConstants {













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













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













  }





























  public class CarrierConfigManager {















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void overrideConfig(int, @Nullable android.os.PersistableBundle);















  }





























  public final class DataSpecificRegistrationInfo implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo();













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













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













  }



























  public final class LteVopsSupportInfo implements android.os.Parcelable {













    ctor public LteVopsSupportInfo(int, int);













    method public int describeContents();













    method public int getEmcBearerSupport();













    method public int getVopsSupport();













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













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













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













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













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













  }





























  public class MbmsDownloadSession implements java.lang.AutoCloseable {















    field public static final String MBMS_DOWNLOAD_SERVICE_OVERRIDE_METADATA = "mbms-download-service-override";















  }









@@ -2568,7 +2592,52 @@ package android.telephony {













    field public static final String MBMS_STREAMING_SERVICE_OVERRIDE_METADATA = "mbms-streaming-service-override";















  }





























  public final class NetworkRegistrationInfo implements android.os.Parcelable {













    method public int describeContents();













    method public int getAccessNetworkTechnology();













    method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();













    method @Nullable public android.telephony.CellIdentity getCellIdentity();













    method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();













    method public int getDomain();













    method public int getRegistrationState();













    method public int getRejectCause();













    method public int getRoamingType();













    method public int getTransportType();













    method public boolean isEmergencyEnabled();













    method public boolean isRoaming();













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













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













  }



























  public static final class NetworkRegistrationInfo.Builder {













    ctor public NetworkRegistrationInfo.Builder();













    method @NonNull public android.telephony.NetworkRegistrationInfo build();













    method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setAccessNetworkTechnology(int);













    method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setAvailableServices(@NonNull java.util.List<java.lang.Integer>);













    method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setCellIdentity(@Nullable android.telephony.CellIdentity);













    method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setDomain(int);













    method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setEmergencyOnly(boolean);













    method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRegistrationState(int);













    method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRejectCause(int);













    method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setTransportType(int);













  }





























  public class ServiceState implements android.os.Parcelable {













    method public void addNetworkRegistrationInfo(android.telephony.NetworkRegistrationInfo);















    method public void setCdmaSystemAndNetworkId(int, int);















    method public void setCellBandwidths(int[]);















    method public void setChannelNumber(int);

































telephony/java/android/telephony/AccessNetworkConstants.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.telephony;





























import android.annotation.IntDef;















import android.annotation.SystemApi;













import android.annotation.TestApi;































import java.lang.annotation.Retention;















import java.lang.annotation.RetentionPolicy;










@@ -51,6 +52,7 @@ public final class AccessNetworkConstants {













     * @hide















     */















    @SystemApi













    @TestApi















    public static final int TRANSPORT_TYPE_WWAN = 1;































    /**









@@ -58,6 +60,7 @@ public final class AccessNetworkConstants {













     * @hide















     */















    @SystemApi













    @TestApi















    public static final int TRANSPORT_TYPE_WLAN = 2;































    /** @hide */

































telephony/java/android/telephony/DataSpecificRegistrationStates.java→telephony/java/android/telephony/DataSpecificRegistrationInfo.java



+38
−20




























Original line number
Diff line number
Diff line













/*













 * Copyright 2018 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */





























package android.telephony;































import android.annotation.NonNull;















import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.os.Parcel;















import android.os.Parcelable;

























@@ -13,7 +30,8 @@ import java.util.Objects;













 * @hide















 */















@SystemApi













public final class DataSpecificRegistrationStates implements Parcelable{













@TestApi













public final class DataSpecificRegistrationInfo implements Parcelable {















    /**















     * @hide















     * The maximum number of simultaneous Data Calls that










@@ -53,27 +71,27 @@ public final class DataSpecificRegistrationStates implements Parcelable{













    /**















     * Provides network support info for LTE VoPS and LTE Emergency bearer support















     */













    private final LteVopsSupportInfo lteVopsSupportInfo;













    private final LteVopsSupportInfo mLteVopsSupportInfo;































    /**















     * @hide















     */













    DataSpecificRegistrationStates(













    DataSpecificRegistrationInfo(















            int maxDataCalls, boolean isDcNrRestricted, boolean isNrAvailable,















            boolean isEnDcAvailable, LteVopsSupportInfo lteVops) {















        this.maxDataCalls = maxDataCalls;















        this.isDcNrRestricted = isDcNrRestricted;















        this.isNrAvailable = isNrAvailable;















        this.isEnDcAvailable = isEnDcAvailable;













        this.lteVopsSupportInfo = lteVops;













        this.mLteVopsSupportInfo = lteVops;















    }





























    private DataSpecificRegistrationStates(Parcel source) {













    private DataSpecificRegistrationInfo(Parcel source) {















        maxDataCalls = source.readInt();















        isDcNrRestricted = source.readBoolean();















        isNrAvailable = source.readBoolean();















        isEnDcAvailable = source.readBoolean();













        lteVopsSupportInfo = LteVopsSupportInfo.CREATOR.createFromParcel(source);













        mLteVopsSupportInfo = LteVopsSupportInfo.CREATOR.createFromParcel(source);















    }































    @Override









@@ -82,7 +100,7 @@ public final class DataSpecificRegistrationStates implements Parcelable{













        dest.writeBoolean(isDcNrRestricted);















        dest.writeBoolean(isNrAvailable);















        dest.writeBoolean(isEnDcAvailable);













        lteVopsSupportInfo.writeToParcel(dest, flags);













        mLteVopsSupportInfo.writeToParcel(dest, flags);















    }































    @Override









@@ -98,7 +116,7 @@ public final class DataSpecificRegistrationStates implements Parcelable{













                .append(" isDcNrRestricted = " + isDcNrRestricted)















                .append(" isNrAvailable = " + isNrAvailable)















                .append(" isEnDcAvailable = " + isEnDcAvailable)













                .append(lteVopsSupportInfo.toString())













                .append(mLteVopsSupportInfo.toString())















                .append(" }")















                .toString();















    }









@@ -106,41 +124,41 @@ public final class DataSpecificRegistrationStates implements Parcelable{













    @Override















    public int hashCode() {















        return Objects.hash(maxDataCalls, isDcNrRestricted, isNrAvailable, isEnDcAvailable,













            lteVopsSupportInfo);













                mLteVopsSupportInfo);















    }































    @Override















    public boolean equals(Object o) {















        if (this == o) return true;





























        if (!(o instanceof DataSpecificRegistrationStates)) return false;













        if (!(o instanceof DataSpecificRegistrationInfo)) return false;





























        DataSpecificRegistrationStates other = (DataSpecificRegistrationStates) o;













        DataSpecificRegistrationInfo other = (DataSpecificRegistrationInfo) o;















        return this.maxDataCalls == other.maxDataCalls















                && this.isDcNrRestricted == other.isDcNrRestricted















                && this.isNrAvailable == other.isNrAvailable















                && this.isEnDcAvailable == other.isEnDcAvailable













                && this.lteVopsSupportInfo.equals(other.lteVopsSupportInfo);













                && this.mLteVopsSupportInfo.equals(other.mLteVopsSupportInfo);















    }





























    public static final @android.annotation.NonNull Parcelable.Creator<DataSpecificRegistrationStates> CREATOR =













            new Parcelable.Creator<DataSpecificRegistrationStates>() {













    public static final @NonNull Parcelable.Creator<DataSpecificRegistrationInfo> CREATOR =













            new Parcelable.Creator<DataSpecificRegistrationInfo>() {















                @Override













                public DataSpecificRegistrationStates createFromParcel(Parcel source) {













                    return new DataSpecificRegistrationStates(source);













                public DataSpecificRegistrationInfo createFromParcel(Parcel source) {













                    return new DataSpecificRegistrationInfo(source);















                }































                @Override













                public DataSpecificRegistrationStates[] newArray(int size) {













                    return new DataSpecificRegistrationStates[size];













                public DataSpecificRegistrationInfo[] newArray(int size) {













                    return new DataSpecificRegistrationInfo[size];















                }















            };































    /**













     * @return LteVopsSupportInfo













     * @return The LTE VOPS (Voice over Packet Switched) support information















     */















    @NonNull















    public LteVopsSupportInfo getLteVopsSupportInfo() {













        return lteVopsSupportInfo;













        return mLteVopsSupportInfo;















    }















}
























telephony/java/android/telephony/LteVopsSupportInfo.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.telephony;





























import android.annotation.IntDef;















import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.os.Parcel;















import android.os.Parcelable;

























@@ -30,6 +31,7 @@ import java.util.Objects;













 * @hide















 */















@SystemApi













@TestApi















public final class LteVopsSupportInfo implements Parcelable {































    /**@hide*/