summaryrefslogtreecommitdiffstats
path: root/telecomm/java
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-06-09 20:09:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-09 20:09:57 +0000
commit03123839e46f329018bb6216070abe62fd2b7175 (patch)
tree99dadb2698751e89dfbca61c6675e19c8272e5b0 /telecomm/java
parenteac27519087723d9ba9cf3e19daff1cc46656eae (diff)
parent02fb5bc52b45333a978a45a257dd7f9c9c9bc632 (diff)
downloadframeworks_base-03123839e46f329018bb6216070abe62fd2b7175.zip
frameworks_base-03123839e46f329018bb6216070abe62fd2b7175.tar.gz
frameworks_base-03123839e46f329018bb6216070abe62fd2b7175.tar.bz2
Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev
Diffstat (limited to 'telecomm/java')
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index fb0ecb0..368e137 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -162,8 +162,8 @@ public class TelecomManager {
* The extra used by a {@link ConnectionService} to provide the handle of the caller that
* has initiated a new incoming call.
*/
- public static final String EXTRA_INCOMING_CALL_HANDLE =
- "android.telecom.extra.INCOMING_CALL_HANDLE";
+ public static final String EXTRA_INCOMING_CALL_ADDRESS =
+ "android.telecom.extra.INCOMING_CALL_ADDRESS";
/**
* Optional extra for {@link #ACTION_INCOMING_CALL} containing a {@link Bundle} which contains