commit 4694b12e00f5f45caefa55c197c2b8bfcba329e4
author Daniel Bright <dbright@google.com> Thu Jan 16 02:11:56 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 16 02:11:56 2020 +0000
tree 5ba2d0d0488d0483ef6d6d6e7918f445eb8600de
parent 5946fcb969cfd7bd759063a6acce3f4cadfbc292
parent bebd1577340bad2f18d66546e26c3ac767d9664a

Merge "Using PhoneTypes in TelephonyManager"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d4fbdf3..ab1918fc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -46518,6 +46518,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 91fc3ac..12355bc 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -10780,6 +10780,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 5e31c5a..13aad7e 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2276,6 +2276,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.