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

Commit 45c90754 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis" am: cbfaae4f 

Change-Id: Ie81292aa2ca5f232e27e28ebfd1fe7cc3c454a0b
parents ad78b373 cbfaae4f

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -46062,7 +46062,6 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0

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

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

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

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

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

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

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

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

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

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

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

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

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -9536,7 +9536,6 @@ package android.telephony { 
    field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L

    field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L

    field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L

    field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L

    field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L

    field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L

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

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

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

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

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

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

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

telephony/java/android/telephony/TelephonyManager.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -2301,7 +2301,12 @@ public class TelephonyManager { 
    public static final int PHONE_TYPE_CDMA = PhoneConstants.PHONE_TYPE_CDMA;

    public static final int PHONE_TYPE_CDMA = PhoneConstants.PHONE_TYPE_CDMA;

    /** Phone is via SIP. */

    /** Phone is via SIP. */

    public static final int PHONE_TYPE_SIP = PhoneConstants.PHONE_TYPE_SIP;

    public static final int PHONE_TYPE_SIP = PhoneConstants.PHONE_TYPE_SIP;

    /** Phone is via IMS. */



    /**

     * Phone is via IMS.

     *

     * @hide

     */

    public static final int PHONE_TYPE_IMS = PhoneConstants.PHONE_TYPE_IMS;

    public static final int PHONE_TYPE_IMS = PhoneConstants.PHONE_TYPE_IMS;





    /**

    /**
@@ -2309,7 +2314,6 @@ public class TelephonyManager { 
     *

     *

     * @hide

     * @hide

     */

     */

    @SystemApi

    public static final int PHONE_TYPE_THIRD_PARTY = PhoneConstants.PHONE_TYPE_THIRD_PARTY;

    public static final int PHONE_TYPE_THIRD_PARTY = PhoneConstants.PHONE_TYPE_THIRD_PARTY;





    /**

    /**