commit c8fb6e0efe69dcb47d2a8e97939e269c208775b7
author Daniel Bright <dbright@google.com> Wed Jan 15 12:45:14 2020 -0800
committer Hall Liu <hallliu@google.com> Thu Jan 16 17:29:55 2020 -0800
tree 30e25913f59703fa7a0394f11cf105acf45540ad
parent ad189b5e606a525ad905fd212675c232fc8e3858

Using PhoneTypes in TelephonyManager

Bug: 147465477
Test: TelecomUnitTests
Change-Id: Idd0794a1b2b91e4635f63a35e468f3fe0bbe7990

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index b20da79..f4ce3ec 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45735,6 +45735,7 @@
     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_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_SIP = 3; // 0x3
     field public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2; // 0x2

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index eed6d67..6beb79b 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9337,6 +9337,7 @@
     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_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_ON = 1; // 0x1
     field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 690393b..bd8321e 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1950,6 +1950,16 @@
     public static final int PHONE_TYPE_CDMA = PhoneConstants.PHONE_TYPE_CDMA;
     /** Phone is via SIP. */
     public static final int PHONE_TYPE_SIP = PhoneConstants.PHONE_TYPE_SIP;
+    /** Phone is via IMS. */
+    public static final int PHONE_TYPE_IMS = PhoneConstants.PHONE_TYPE_IMS;
+
+    /**
+     * Phone is via Third Party.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final int PHONE_TYPE_THIRD_PARTY = PhoneConstants.PHONE_TYPE_THIRD_PARTY;
 
     /**
      * Returns the current phone type.