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

Merge "telephony annotations part 2" am: 1a9f2d0e78

Browse Source 
am: ccf305e76f

Change-Id: Ib08af42a04289f0cf6bc8987341afdfe02c5b7a6
This commit is contained in:
Jack Yu
2019-11-20 17:06:27 -08:00
committed by android-build-merger
parent 3c4ba7375c ccf305e76f
commit 8782bfab97
7 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/telephony/PhoneStateListener.java
View File

@@ -184,7 +184,8 @@ public class PhoneStateListener {
public static final int LISTEN_CELL_INFO = 0x00000400;
/**
* Listen for {@link PreciseCallState.State} of ringing, background and foreground calls.
* Listen for {@link android.telephony.Annotation.PreciseCallStates} of ringing,
* background and foreground calls.
*
* @hide
*/

9
core/java/android/telephony/TelephonyRegistryManager.java
View File

@@ -29,13 +29,13 @@ import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.telephony.Annotation;
import android.telephony.Annotation.ApnType;
import android.telephony.Annotation.CallState;
import android.telephony.Annotation.DataActivityType;
import android.telephony.Annotation.DataFailureCause;
import android.telephony.Annotation.DataState;
import android.telephony.Annotation.NetworkType;
import android.telephony.Annotation.PreciseCallStates;
import android.telephony.Annotation.RadioPowerState;
import android.telephony.Annotation.SimActivationState;
import android.telephony.Annotation.SrvccState;
@@ -43,7 +43,6 @@ import android.telephony.CallQuality;
import android.telephony.CellInfo;
import android.telephony.DisconnectCause;
import android.telephony.PhoneCapability;
import android.telephony.PreciseCallState.State;
import android.telephony.ServiceState;
import android.telephony.SignalStrength;
import android.telephony.TelephonyManager;
@@ -624,8 +623,10 @@ public class TelephonyRegistryManager {
*
* @hide
*/
public void notifyPreciseCallState(int subId, int slotIndex, @State int ringCallPreciseState,
@State int foregroundCallPreciseState, @State int backgroundCallPreciseState) {
public void notifyPreciseCallState(int subId, int slotIndex,
@PreciseCallStates int ringCallPreciseState,
@PreciseCallStates int foregroundCallPreciseState,
@PreciseCallStates int backgroundCallPreciseState) {
try {
sRegistry.notifyPreciseCallState(slotIndex, subId, ringCallPreciseState,
foregroundCallPreciseState, backgroundCallPreciseState);