From 53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92 Mon Sep 17 00:00:00 2001
From: Tony Mak
Date: Thu, 19 May 2016 13:40:38 +0100
Subject: [PATCH] Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based
on API review
TODO: After updating all places that use the SDK, remove/hide the old API
Bug: 28842878
Change-Id: I131be644439080dd0507cd10d8bd6618246ee7ad
---
api/current.txt | 3 ++-
api/system-current.txt | 3 ++-
api/test-current.txt | 3 ++-
docs/html/preview/features/afw.jd | 2 +-
telecomm/java/android/telecom/Call.java | 7 ++++++-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/api/current.txt b/api/current.txt
index 1a2774aa03c8..17182dbde4ce 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36005,10 +36005,11 @@ package android.telecom {
field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
field public static final int PROPERTY_CONFERENCE = 1; // 0x1
field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
+ field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20
field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
field public static final int PROPERTY_WIFI = 8; // 0x8
- field public static final int PROPERTY_WORK_CALL = 32; // 0x20
+ field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
}
public final class CallAudioState implements android.os.Parcelable {
diff --git a/api/system-current.txt b/api/system-current.txt
index 0fb1826fda81..9bccb9ebc837 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -38841,10 +38841,11 @@ package android.telecom {
field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
field public static final int PROPERTY_CONFERENCE = 1; // 0x1
field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
+ field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20
field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
field public static final int PROPERTY_WIFI = 8; // 0x8
- field public static final int PROPERTY_WORK_CALL = 32; // 0x20
+ field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
}
public static abstract deprecated class Call.Listener extends android.telecom.Call.Callback {
diff --git a/api/test-current.txt b/api/test-current.txt
index b14d60117488..13a96e013670 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -36082,10 +36082,11 @@ package android.telecom {
field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
field public static final int PROPERTY_CONFERENCE = 1; // 0x1
field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
+ field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20
field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
field public static final int PROPERTY_WIFI = 8; // 0x8
- field public static final int PROPERTY_WORK_CALL = 32; // 0x20
+ field public static final deprecated int PROPERTY_WORK_CALL = 32; // 0x20
}
public final class CallAudioState implements android.os.Parcelable {
diff --git a/docs/html/preview/features/afw.jd b/docs/html/preview/features/afw.jd
index dc53bd977f2f..9b94c079cb92 100644
--- a/docs/html/preview/features/afw.jd
+++ b/docs/html/preview/features/afw.jd
@@ -515,7 +515,7 @@ Android N.
The dialer should check for the new flag
- android.telecom.Call.PROPERTY_WORK_CALL
to determine if a call
+ android.telecom.Call.PROPERTY_ENTERPRISE_CALL
to determine if a call
is a work call. If a call is a work call, the dialer should indicate this,
such as by adding a work badge.
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index 39a12070a69b..43f8739f74fd 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -287,11 +287,16 @@ public final class Call {
public static final int PROPERTY_HIGH_DEF_AUDIO = 0x00000010;
/**
- * Whether the call is associated with the work profile.
+ * @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;
+
+ /**
* When set, indicates that this {@code Call} does not actually exist locally for the
* {@link ConnectionService}.
*
--
2.11.0