summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-06-05 08:41:47 -0700
committerYorke Lee <yorkelee@google.com>2014-06-05 13:48:12 -0700
commitd8819baf858b294bab16ea811da4acf39dc4552c (patch)
treed20d70bc09d396bd689b27b4cbc76554bf347722 /telephony/java/com
parentafcece8115d89802b0618dacf8a6a18fc5a349b1 (diff)
downloadframeworks_base-d8819baf858b294bab16ea811da4acf39dc4552c.zip
frameworks_base-d8819baf858b294bab16ea811da4acf39dc4552c.tar.gz
frameworks_base-d8819baf858b294bab16ea811da4acf39dc4552c.tar.bz2
API changes to Telephony per API review
* Make context the first argument for isLocalEmergencyNumber and isPotentialLocalEmergencyNumber * Hide DisconnectCause Bug: 15432083 Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
Diffstat (limited to 'telephony/java/com')
-rw-r--r--telephony/java/com/android/internal/telephony/CallerInfo.java2
-rw-r--r--telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallerInfo.java b/telephony/java/com/android/internal/telephony/CallerInfo.java
index f6143ed..f8dd7cf 100644
--- a/telephony/java/com/android/internal/telephony/CallerInfo.java
+++ b/telephony/java/com/android/internal/telephony/CallerInfo.java
@@ -276,7 +276,7 @@ public class CallerInfo {
// Change the callerInfo number ONLY if it is an emergency number
// or if it is the voicemail number. If it is either, take a
// shortcut and skip the query.
- if (PhoneNumberUtils.isLocalEmergencyNumber(number, context)) {
+ if (PhoneNumberUtils.isLocalEmergencyNumber(context, number)) {
return new CallerInfo().markAsEmergency(context);
} else if (PhoneNumberUtils.isVoiceMailNumber(number)) {
return new CallerInfo().markAsVoiceMail();
diff --git a/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java b/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
index 74f73b5..34fed5e 100644
--- a/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
+++ b/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
@@ -399,7 +399,7 @@ public class CallerInfoAsyncQuery {
cw.number = number;
// check to see if these are recognized numbers, and use shortcuts if we can.
- if (PhoneNumberUtils.isLocalEmergencyNumber(number, context)) {
+ if (PhoneNumberUtils.isLocalEmergencyNumber(context, number)) {
cw.event = EVENT_EMERGENCY_NUMBER;
} else if (PhoneNumberUtils.isVoiceMailNumber(number)) {
cw.event = EVENT_VOICEMAIL_NUMBER;