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

Merge "Update the RTT features constant."

Browse Source 
am: c18b175d87

Change-Id: Ic4419be53f3390336a5b95abe34a03944b3437e4
This commit is contained in:
Eric Erfanian
2018-03-06 19:58:14 +00:00
committed by android-build-merger
parent f17dcdaea9 c18b175d87
commit 1a59a97a0c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -33430,7 +33430,7 @@ package android.provider {
field public static final java.lang.String FEATURES = "features";
field public static final int FEATURES_HD_CALL = 4; // 0x4
field public static final int FEATURES_PULLED_EXTERNALLY = 2; // 0x2
field public static final int FEATURES_RTT = 16; // 0x10
field public static final int FEATURES_RTT = 32; // 0x20
field public static final int FEATURES_VIDEO = 1; // 0x1
field public static final int FEATURES_WIFI = 8; // 0x8
field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";

8
core/java/android/provider/CallLog.java
View File

@@ -223,14 +223,14 @@ public class CallLog {
/** Call was WIFI call. */
public static final int FEATURES_WIFI = 1 << 3;
/** Call was on RTT at some point */
public static final int FEATURES_RTT = 1 << 4;
/**
* Indicates the call underwent Assisted Dialing.
* @hide
*/
public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10;
public static final int FEATURES_ASSISTED_DIALING_USED = 1 << 4;
/** Call was on RTT at some point */
public static final int FEATURES_RTT = 1 << 5;
/**
* The phone number as the user entered it.