Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added missed incoming call SMS support" into rvc-dev am: 46dd4eb94a

Browse Source 
Change-Id: I0f9b362b6c0a4c98976b6add5052bfd3a048f88b
This commit is contained in:
Automerger Merge Worker
2020-02-25 00:25:09 +00:00
parent 1066b972bc 46dd4eb94a
commit 99c57ef4ed
3 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telecomm/java/android/telecom/Connection.java
View File

@@ -3358,7 +3358,6 @@ public abstract class Connection extends Conferenceable {
private boolean mImmutable = false; private boolean mImmutable = false;
public FailureSignalingConnection(DisconnectCause disconnectCause) { public FailureSignalingConnection(DisconnectCause disconnectCause) {
setDisconnected(disconnectCause); setDisconnected(disconnectCause);
mImmutable = true;
} }
public void checkImmutable() { public void checkImmutable() {

8
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -329,6 +329,14 @@ public class TelecomManager {
public static final String EXTRA_CALL_CREATED_TIME_MILLIS = public static final String EXTRA_CALL_CREATED_TIME_MILLIS =
"android.telecom.extra.CALL_CREATED_TIME_MILLIS"; "android.telecom.extra.CALL_CREATED_TIME_MILLIS";
/**
* Optional extra for incoming and outgoing calls containing a long which specifies the Epoch
* time the call was created.
* @hide
*/
public static final String EXTRA_CALL_CREATED_EPOCH_TIME_MILLIS =
"android.telecom.extra.CALL_CREATED_EPOCH_TIME_MILLIS";
/** /**
* Optional extra for incoming and outgoing calls containing a long which specifies the time * Optional extra for incoming and outgoing calls containing a long which specifies the time
* telecom began routing the call. This value is in milliseconds since boot. * telecom began routing the call. This value is in milliseconds since boot.

27
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3549,6 +3549,30 @@ public class CarrierConfigManager {
public static final String KEY_SHOW_FORWARDED_NUMBER_BOOL = public static final String KEY_SHOW_FORWARDED_NUMBER_BOOL =
"show_forwarded_number_bool"; "show_forwarded_number_bool";
/**
* The list of originating address of missed incoming call SMS. If the SMS has originator
* matched, the SMS will be treated as special SMS for notifying missed incoming call to the
* user.
*
* @hide
*/
public static final String KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY =
"missed_incoming_call_sms_originator_string_array";
/**
* The patterns of missed incoming call sms. This is the regular expression used for
* matching the missed incoming call's date, time, and caller id. The pattern should match
* fields for at least month, day, hour, and minute. Year is optional although it is encouraged.
*
* An usable pattern should look like this:
* ^(?<month>0[1-9]|1[012])\/(?<day>0[1-9]|1[0-9]|2[0-9]|3[0-1]) (?<hour>[0-1][0-9]|2[0-3]):
* (?<minute>[0-5][0-9])\s*(?<callerId>[0-9]+)\s*$
*
* @hide
*/
public static final String KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY =
"missed_incoming_call_sms_pattern_string_array";
/** The default value for every variable. */ /** The default value for every variable. */
private final static PersistableBundle sDefaults; private final static PersistableBundle sDefaults;
@@ -4057,6 +4081,9 @@ public class CarrierConfigManager {
sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false); sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);
sDefaults.putBoolean(KEY_SHOW_FORWARDED_NUMBER_BOOL, false); sDefaults.putBoolean(KEY_SHOW_FORWARDED_NUMBER_BOOL, false);
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1)); sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1));
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY,
new String[0]);
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]);
} }
/** /**