commit 23642330a7e0732976a0c25ca7d54f59055a92d9
author Tony Mak <tonymak@google.com> Mon May 23 17:26:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 17:26:45 2016 +0000
tree 03fe10e1822a6afb51ef440e54c211faf26ec08d
parent 7fea69c3b6e5c2fbfa960d84a05a62390752ec30
parent 5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e

Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
am: 5ee420c0d5

* commit '5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
  Remove PROPERTY_WORK_CALL

Change-Id: I17d204d01b2fc356fa6b70d4c5cd73f4b0a10d6c

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 82570fa..5de0591 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36123,7 +36123,6 @@
     field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
     field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40
     field public static final int PROPERTY_WIFI = 8; // 0x8
-    field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
   }
 
   public final class CallAudioState implements android.os.Parcelable {

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 6d38777..8a78a90 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -38959,7 +38959,6 @@
     field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
     field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40
     field public static final int PROPERTY_WIFI = 8; // 0x8
-    field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
   }
 
   public static abstract deprecated class Call.Listener extends android.telecom.Call.Callback {

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 3cbc773..507e811 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -36201,7 +36201,6 @@
     field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
     field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40
     field public static final int PROPERTY_WIFI = 8; // 0x8
-    field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
   }
 
   public final class CallAudioState implements android.os.Parcelable {

telecomm/java/android/telecom/Call.java

diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index f2a724f..1ccacc2 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -286,11 +286,6 @@
         public static final int PROPERTY_HIGH_DEF_AUDIO = 0x00000010;
 
         /**
-         * @deprecated Use {@link #PROPERTY_ENTERPRISE_CALL} instead.
-         */
-        public static final int PROPERTY_WORK_CALL = 0x00000020;
-
-        /**
          * Whether the call is associated with the work profile.
          */
         public static final int PROPERTY_ENTERPRISE_CALL = 0x00000020;