drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API changes to Telephony per API review

Browse Source 
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

* Hide DisconnectCause
Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
This commit is contained in:
Yorke Lee
2014-06-05 08:41:47 -07:00
parent afcece8115
commit d8819baf85
5 changed files with 16 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
api/current.txt
View File

@ -27394,55 +27394,6 @@ package android.telephony {
field public static final android.os.Parcelable.Creator CREATOR;
}
public class DisconnectCause {
method public static java.lang.String toString(int);
field public static final int BUSY = 4; // 0x4
field public static final int CALL_BARRED = 20; // 0x14
field public static final int CDMA_ACCESS_BLOCKED = 35; // 0x23
field public static final int CDMA_ACCESS_FAILURE = 32; // 0x20
field public static final int CDMA_CALL_LOST = 41; // 0x29
field public static final int CDMA_DROP = 27; // 0x1b
field public static final int CDMA_INTERCEPT = 28; // 0x1c
field public static final int CDMA_LOCKED_UNTIL_POWER_CYCLE = 26; // 0x1a
field public static final int CDMA_NOT_EMERGENCY = 34; // 0x22
field public static final int CDMA_PREEMPTED = 33; // 0x21
field public static final int CDMA_REORDER = 29; // 0x1d
field public static final int CDMA_RETRY_ORDER = 31; // 0x1f
field public static final int CDMA_SO_REJECT = 30; // 0x1e
field public static final int CONGESTION = 5; // 0x5
field public static final int CS_RESTRICTED = 22; // 0x16
field public static final int CS_RESTRICTED_EMERGENCY = 24; // 0x18
field public static final int CS_RESTRICTED_NORMAL = 23; // 0x17
field public static final int DIALED_MMI = 39; // 0x27
field public static final int EMERGENCY_ONLY = 37; // 0x25
field public static final int ERROR_UNSPECIFIED = 36; // 0x24
field public static final int FDN_BLOCKED = 21; // 0x15
field public static final int ICC_ERROR = 19; // 0x13
field public static final int INCOMING_MISSED = 1; // 0x1
field public static final int INCOMING_REJECTED = 16; // 0x10
field public static final int INVALID_CREDENTIALS = 10; // 0xa
field public static final int INVALID_NUMBER = 7; // 0x7
field public static final int LIMIT_EXCEEDED = 15; // 0xf
field public static final int LOCAL = 3; // 0x3
field public static final int LOST_SIGNAL = 14; // 0xe
field public static final int MAXIMUM_VALID_VALUE = 42; // 0x2a
field public static final int MINIMUM_VALID_VALUE = 0; // 0x0
field public static final int MMI = 6; // 0x6
field public static final int NORMAL = 2; // 0x2
field public static final int NOT_DISCONNECTED = 0; // 0x0
field public static final int NOT_VALID = -1; // 0xffffffff
field public static final int NO_PHONE_NUMBER_SUPPLIED = 38; // 0x26
field public static final int NUMBER_UNREACHABLE = 8; // 0x8
field public static final int OUT_OF_NETWORK = 11; // 0xb
field public static final int OUT_OF_SERVICE = 18; // 0x12
field public static final int POWER_OFF = 17; // 0x11
field public static final int SERVER_ERROR = 12; // 0xc
field public static final int SERVER_UNREACHABLE = 9; // 0x9
field public static final int TIMED_OUT = 13; // 0xd
field public static final int UNOBTAINABLE_NUMBER = 25; // 0x19
field public static final int VOICEMAIL_NUMBER_MISSING = 40; // 0x28
}
public class NeighboringCellInfo implements android.os.Parcelable {
ctor public deprecated NeighboringCellInfo();
ctor public deprecated NeighboringCellInfo(int, int);
@ -27494,7 +27445,7 @@ package android.telephony {
method public static boolean isEmergencyNumber(java.lang.String);
method public static boolean isGlobalPhoneNumber(java.lang.String);
method public static boolean isISODigit(char);
method public static boolean isLocalEmergencyNumber(java.lang.String, android.content.Context);
method public static boolean isLocalEmergencyNumber(android.content.Context, java.lang.String);
method public static final boolean isNonSeparator(char);
method public static final boolean isReallyDialable(char);
method public static final boolean isStartsPostDial(char);

2
telephony/java/android/telephony/DisconnectCause.java
View File

@ -18,6 +18,8 @@ package android.telephony;
/**
* Contains disconnect call causes generated by the framework and the RIL.
*
* @hide
*/
public class DisconnectCause {

26
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@ -1742,16 +1742,14 @@ public class PhoneNumberUtils
/**
* Checks if a given number is an emergency number for the country that the user is in.
*
* @param number the number to look up.
* @param context the specific context which the number should be checked against
* @param number the number to look up.
*
* @return true if the specified number is an emergency number for the country the user
* is currently in.
*/
public static boolean isLocalEmergencyNumber(String number, Context context) {
return isLocalEmergencyNumberInternal(number,
context,
true /* useExactMatch */);
public static boolean isLocalEmergencyNumber(Context context, String number) {
return isLocalEmergencyNumberInternal(context, number, true /* useExactMatch */);
}
/**
@ -1767,27 +1765,24 @@ public class PhoneNumberUtils
* This method is intended for internal use by the phone app when
* deciding whether to allow ACTION_CALL intents from 3rd party apps
* (where we're required to *not* allow emergency calls to be placed.)
*
* @param number the number to look up.
* @param context the specific context which the number should be checked against
* @param number the number to look up.
*
* @return true if the specified number is an emergency number for a local country, based on the
* CountryDetector.
*
* @see android.location.CountryDetector
* @hide
*/
public static boolean isPotentialLocalEmergencyNumber(String number, Context context) {
return isLocalEmergencyNumberInternal(number,
context,
false /* useExactMatch */);
public static boolean isPotentialLocalEmergencyNumber(Context context, String number) {
return isLocalEmergencyNumberInternal(context, number, false /* useExactMatch */);
}
/**
* Helper function for isLocalEmergencyNumber() and
* isPotentialLocalEmergencyNumber().
*
* @param number the number to look up.
* @param context the specific context which the number should be checked against
* @param number the number to look up.
* @param useExactMatch if true, consider a number to be an emergency
* number only if it *exactly* matches a number listed in
* the RIL / SIM. If false, a number is considered to be an
@ -1799,8 +1794,7 @@ public class PhoneNumberUtils
*
* @see android.location.CountryDetector
*/
private static boolean isLocalEmergencyNumberInternal(String number,
Context context,
private static boolean isLocalEmergencyNumberInternal(Context context, String number,
boolean useExactMatch) {
String countryIso;
CountryDetector detector = (CountryDetector) context.getSystemService(

2
telephony/java/com/android/internal/telephony/CallerInfo.java
View File

@ -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();

2
telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
View File

@ -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;