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

Merge "telephony annotations part 2"

Browse Source
This commit is contained in:
Chen Xu
2019-10-03 18:15:17 +00:00
committed by Android (Google) Code Review
parent 16660951c8 f85cf993d3
commit fac787d7f2
7 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,13 +21,13 @@ import android.net.NetworkCapabilities;
import android.os.Bundle;
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;
@@ -35,7 +35,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;
@@ -466,8 +465,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);

5
telecomm/java/android/telecom/Conference.java
View File

@@ -24,6 +24,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.SystemClock;
import android.telecom.Connection.VideoProvider;
import android.telephony.Annotation.RilRadioTechnology;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
import android.util.ArraySet;
@@ -687,7 +688,7 @@ public abstract class Conference extends Conferenceable {
*
* @hide
*/
public final void setCallRadioTech(@ServiceState.RilRadioTechnology int vrat) {
public final void setCallRadioTech(@RilRadioTechnology int vrat) {
putExtra(TelecomManager.EXTRA_CALL_NETWORK_TYPE,
ServiceState.rilRadioTechnologyToNetworkType(vrat));
}
@@ -700,7 +701,7 @@ public abstract class Conference extends Conferenceable {
*
* @hide
*/
public final @ServiceState.RilRadioTechnology int getCallRadioTech() {
public final @RilRadioTechnology int getCallRadioTech() {
int voiceNetworkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
Bundle extras = getExtras();
if (extras != null) {

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

@@ -34,6 +34,7 @@ import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.SystemClock;
import android.telephony.Annotation.RilRadioTechnology;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
import android.util.ArraySet;
@@ -1958,7 +1959,7 @@ public abstract class Connection extends Conferenceable {
*
* @hide
*/
public final @ServiceState.RilRadioTechnology int getCallRadioTech() {
public final @RilRadioTechnology int getCallRadioTech() {
int voiceNetworkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
Bundle extras = getExtras();
if (extras != null) {
@@ -2409,7 +2410,7 @@ public abstract class Connection extends Conferenceable {
*
* @hide
*/
public final void setCallRadioTech(@ServiceState.RilRadioTechnology int vrat) {
public final void setCallRadioTech(@RilRadioTechnology int vrat) {
putExtra(TelecomManager.EXTRA_CALL_NETWORK_TYPE,
ServiceState.rilRadioTechnologyToNetworkType(vrat));
// Propagates the call radio technology to its parent {@link android.telecom.Conference}

40
telephony/java/android/telephony/Annotation.java
View File

@@ -469,4 +469,44 @@ public class Annotation {
@Retention(RetentionPolicy.SOURCE)
public @interface DataFailureCause {
}
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"PRECISE_CALL_STATE_"},
value = {
PreciseCallState.PRECISE_CALL_STATE_NOT_VALID,
PreciseCallState.PRECISE_CALL_STATE_IDLE,
PreciseCallState.PRECISE_CALL_STATE_ACTIVE,
PreciseCallState.PRECISE_CALL_STATE_HOLDING,
PreciseCallState.PRECISE_CALL_STATE_DIALING,
PreciseCallState.PRECISE_CALL_STATE_ALERTING,
PreciseCallState. PRECISE_CALL_STATE_INCOMING,
PreciseCallState.PRECISE_CALL_STATE_WAITING,
PreciseCallState.PRECISE_CALL_STATE_DISCONNECTED,
PreciseCallState.PRECISE_CALL_STATE_DISCONNECTING})
public @interface PreciseCallStates {}
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"RIL_RADIO_TECHNOLOGY_" }, value = {
ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN,
ServiceState.RIL_RADIO_TECHNOLOGY_GPRS,
ServiceState.RIL_RADIO_TECHNOLOGY_EDGE,
ServiceState.RIL_RADIO_TECHNOLOGY_UMTS,
ServiceState.RIL_RADIO_TECHNOLOGY_IS95A,
ServiceState.RIL_RADIO_TECHNOLOGY_IS95B,
ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT,
ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0,
ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A,
ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA,
ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA,
ServiceState.RIL_RADIO_TECHNOLOGY_HSPA,
ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B,
ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD,
ServiceState.RIL_RADIO_TECHNOLOGY_LTE,
ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP,
ServiceState.RIL_RADIO_TECHNOLOGY_GSM,
ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA,
ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN,
ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA,
ServiceState.RIL_RADIO_TECHNOLOGY_NR})
public @interface RilRadioTechnology {}
}

3
telephony/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
*/

34
telephony/java/android/telephony/PreciseCallState.java
View File

@@ -23,6 +23,7 @@ import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.Annotation.PreciseCallStates;
import android.telephony.DisconnectCause;
import android.telephony.PreciseDisconnectCause;
@@ -48,22 +49,6 @@ import java.util.Objects;
@SystemApi
public final class PreciseCallState implements Parcelable {
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"PRECISE_CALL_STATE_"},
value = {
PRECISE_CALL_STATE_NOT_VALID,
PRECISE_CALL_STATE_IDLE,
PRECISE_CALL_STATE_ACTIVE,
PRECISE_CALL_STATE_HOLDING,
PRECISE_CALL_STATE_DIALING,
PRECISE_CALL_STATE_ALERTING,
PRECISE_CALL_STATE_INCOMING,
PRECISE_CALL_STATE_WAITING,
PRECISE_CALL_STATE_DISCONNECTED,
PRECISE_CALL_STATE_DISCONNECTING})
public @interface State {}
/** Call state is not valid (Not received a call state). */
public static final int PRECISE_CALL_STATE_NOT_VALID = -1;
/** Call state: No activity. */
@@ -85,9 +70,9 @@ public final class PreciseCallState implements Parcelable {
/** Call state: Disconnecting. */
public static final int PRECISE_CALL_STATE_DISCONNECTING = 8;
private @State int mRingingCallState = PRECISE_CALL_STATE_NOT_VALID;
private @State int mForegroundCallState = PRECISE_CALL_STATE_NOT_VALID;
private @State int mBackgroundCallState = PRECISE_CALL_STATE_NOT_VALID;
private @PreciseCallStates int mRingingCallState = PRECISE_CALL_STATE_NOT_VALID;
private @PreciseCallStates int mForegroundCallState = PRECISE_CALL_STATE_NOT_VALID;
private @PreciseCallStates int mBackgroundCallState = PRECISE_CALL_STATE_NOT_VALID;
private int mDisconnectCause = DisconnectCause.NOT_VALID;
private int mPreciseDisconnectCause = PreciseDisconnectCause.NOT_VALID;
@@ -97,8 +82,9 @@ public final class PreciseCallState implements Parcelable {
* @hide
*/
@UnsupportedAppUsage
public PreciseCallState(@State int ringingCall, @State int foregroundCall,
@State int backgroundCall, int disconnectCause,
public PreciseCallState(@PreciseCallStates int ringingCall,
@PreciseCallStates int foregroundCall,
@PreciseCallStates int backgroundCall, int disconnectCause,
int preciseDisconnectCause) {
mRingingCallState = ringingCall;
mForegroundCallState = foregroundCall;
@@ -131,21 +117,21 @@ public final class PreciseCallState implements Parcelable {
/**
* Returns the precise ringing call state.
*/
public @State int getRingingCallState() {
public @PreciseCallStates int getRingingCallState() {
return mRingingCallState;
}
/**
* Returns the precise foreground call state.
*/
public @State int getForegroundCallState() {
public @PreciseCallStates int getForegroundCallState() {
return mForegroundCallState;
}
/**
* Returns the precise background call state.
*/
public @State int getBackgroundCallState() {
public @PreciseCallStates int getBackgroundCallState() {
return mBackgroundCallState;
}

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

@@ -30,6 +30,7 @@ import android.os.Parcelable;
import android.telephony.AccessNetworkConstants.AccessNetworkType;
import android.telephony.AccessNetworkConstants.TransportType;
import android.telephony.Annotation.NetworkType;
import android.telephony.Annotation.RilRadioTechnology;
import android.telephony.NetworkRegistrationInfo.Domain;
import android.telephony.NetworkRegistrationInfo.NRState;
import android.text.TextUtils;
@@ -155,32 +156,6 @@ public class ServiceState implements Parcelable {
*/
public static final int DUPLEX_MODE_TDD = 2;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = { "RIL_RADIO_TECHNOLOGY_" },
value = {
RIL_RADIO_TECHNOLOGY_UNKNOWN,
RIL_RADIO_TECHNOLOGY_GPRS,
RIL_RADIO_TECHNOLOGY_EDGE,
RIL_RADIO_TECHNOLOGY_UMTS,
RIL_RADIO_TECHNOLOGY_IS95A,
RIL_RADIO_TECHNOLOGY_IS95B,
RIL_RADIO_TECHNOLOGY_1xRTT,
RIL_RADIO_TECHNOLOGY_EVDO_0,
RIL_RADIO_TECHNOLOGY_EVDO_A,
RIL_RADIO_TECHNOLOGY_HSDPA,
RIL_RADIO_TECHNOLOGY_HSUPA,
RIL_RADIO_TECHNOLOGY_HSPA,
RIL_RADIO_TECHNOLOGY_EVDO_B,
RIL_RADIO_TECHNOLOGY_EHRPD,
RIL_RADIO_TECHNOLOGY_LTE,
RIL_RADIO_TECHNOLOGY_HSPAP,
RIL_RADIO_TECHNOLOGY_GSM,
RIL_RADIO_TECHNOLOGY_TD_SCDMA,
RIL_RADIO_TECHNOLOGY_IWLAN,
RIL_RADIO_TECHNOLOGY_LTE_CA,
RIL_RADIO_TECHNOLOGY_NR})
public @interface RilRadioTechnology {}
/**
* Available radio technologies for GSM, UMTS and CDMA.
* Duplicates the constants from hardware/radio/include/ril.h