Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f85cf993 authored by Chen Xu's avatar Chen Xu
Browse files

telephony annotations part 2 

adding missing annotations

Bug: 140908357
Test: Build
Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
parent 4884beda

core/java/android/os/telephony/TelephonyRegistryManager.java

+5 −4
Original line number Diff line number Diff line
@@ -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);

telecomm/java/android/telecom/Conference.java

+3 −2
Original line number Diff line number Diff line
@@ -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) {

telecomm/java/android/telecom/Connection.java

+3 −2
Original line number Diff line number Diff line
@@ -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}

telephony/java/android/telephony/Annotation.java

+40 −0
Original line number Diff line number Diff line
@@ -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 {}

}

telephony/java/android/telephony/PhoneStateListener.java

+2 −1
Original line number Diff line number Diff line
@@ -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

     */