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

Commit 24f4fce2 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge changes from topics "pdcs_builder", "pdcs_cleanup", "refactor_pdcs",... 

Merge changes from topics "pdcs_builder", "pdcs_cleanup", "refactor_pdcs", "remove_apn_name_types", "transport_type_and_id"

* changes:
  Added hashcode for ApnSetting class
  Refactored precise data connection state
  Added transport type and id in precise data connection state
  Removed APN name and types from PreciseDataConnectionState
  Added builder for PreciseDataConnectionState
  Remove Deprecated-At-Birth APIs from PDCS
parents 199d2c73 152e11a1

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -47830,6 +47830,7 @@ package android.telephony { 
    method @Nullable public android.net.LinkProperties getLinkProperties();

    method public int getNetworkType();

    method public int getState();

    method public int getTransportType();

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

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

  }

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10838,6 +10838,7 @@ package android.telephony { 
    method @Deprecated public int getDataConnectionApnTypeBitMask();

    method @Deprecated public int getDataConnectionFailCause();

    method @Deprecated public int getDataConnectionState();

    method public int getId();

  }















  public final class PreciseDisconnectCause {

























api/system-removed.txt



+0
−5




























Original line number
Diff line number
Diff line








@@ -180,11 +180,6 @@ package android.telecom {





























package android.telephony {





























  public final class PreciseDataConnectionState implements android.os.Parcelable {













    method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();













    method @Deprecated public int getDataConnectionNetworkType();













  }





























  public class TelephonyManager {















    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();















    method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();

































config/boot-image-profile.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -18839,7 +18839,6 @@ HSPLandroid/telephony/PreciseDataConnectionState;-><init>(Landroid/os/Parcel;)V













HSPLandroid/telephony/PreciseDataConnectionState;-><init>(Landroid/os/Parcel;Landroid/telephony/PreciseDataConnectionState$1;)V















HPLandroid/telephony/PreciseDataConnectionState;->equals(Ljava/lang/Object;)Z















HPLandroid/telephony/PreciseDataConnectionState;->getDataConnectionApn()Ljava/lang/String;













HPLandroid/telephony/PreciseDataConnectionState;->getDataConnectionLinkProperties()Landroid/net/LinkProperties;















HPLandroid/telephony/PreciseDataConnectionState;->getNetworkType()I















HPLandroid/telephony/PreciseDataConnectionState;->getState()I















HSPLandroid/telephony/PreciseDataConnectionState;->toString()Ljava/lang/String;

























core/java/android/telephony/TelephonyRegistryManager.java



+3
−26




























Original line number
Diff line number
Diff line








@@ -26,10 +26,8 @@ import android.os.Binder;













import android.os.Build;















import android.os.RemoteException;















import android.os.ServiceManager;













import android.telephony.Annotation.ApnType;















import android.telephony.Annotation.CallState;















import android.telephony.Annotation.DataActivityType;













import android.telephony.Annotation.DataFailureCause;















import android.telephony.Annotation.DisconnectCauses;















import android.telephony.Annotation.NetworkType;















import android.telephony.Annotation.PreciseCallStates;









@@ -37,7 +35,6 @@ import android.telephony.Annotation.PreciseDisconnectCauses;













import android.telephony.Annotation.RadioPowerState;















import android.telephony.Annotation.SimActivationState;















import android.telephony.Annotation.SrvccState;













import android.telephony.data.ApnSetting;















import android.telephony.emergency.EmergencyNumber;















import android.telephony.ims.ImsReasonInfo;















import android.util.Log;










@@ -413,17 +410,16 @@ public class TelephonyRegistryManager {













     * @param subId for which data connection state changed.















     * @param slotIndex for which data connections state changed. Can be derived from subId except















     * when subId is invalid.













     * @param apnType the apn type bitmask, defined with {@code ApnSetting#TYPE_*} flags.















     * @param preciseState the PreciseDataConnectionState















     *













     * @see android.telephony.PreciseDataConnection













     * @see PreciseDataConnectionState















     * @see TelephonyManager#DATA_DISCONNECTED















     */















    public void notifyDataConnectionForSubscriber(int slotIndex, int subId,













            @ApnType int apnType, @Nullable PreciseDataConnectionState preciseState) {













            @NonNull PreciseDataConnectionState preciseState) {















        try {















            sRegistry.notifyDataConnectionForSubscriber(













                    slotIndex, subId, apnType, preciseState);













                    slotIndex, subId, preciseState);















        } catch (RemoteException ex) {















            // system process is dead















        }










@@ -622,25 +618,6 @@ public class TelephonyRegistryManager {













        }















    }





























    /**













     * Notify precise data connection failed cause on certain subscription.













     *













     * @param subId for which data connection failed.













     * @param slotIndex for which data conenction failed. Can be derived from subId except when













     * subId is invalid.













     * @param apnType the apn type bitmask, defined with {@code ApnSetting#TYPE_*} flags.













     * @param apn the APN {@link ApnSetting#getApnName()} of this data connection.













     * @param failCause data fail cause.













     */













    public void notifyPreciseDataConnectionFailed(int subId, int slotIndex, @ApnType int apnType,













            @Nullable String apn, @DataFailureCause int failCause) {













        try {













            sRegistry.notifyPreciseDataConnectionFailed(slotIndex, subId, apnType, apn, failCause);













        } catch (RemoteException ex) {













            // system process is dead













        }













    }





























    /**















     * Notify single Radio Voice Call Continuity (SRVCC) state change for the currently active call















     * on certain subscription.