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

Commit 8782bfab authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "telephony annotations part 2" am: 1a9f2d0e 

am: ccf305e7

Change-Id: Ib08af42a04289f0cf6bc8987341afdfe02c5b7a6
parents 3c4ba737 ccf305e7

core/java/android/telephony/PhoneStateListener.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,8 @@ public class PhoneStateListener { 
    public static final int LISTEN_CELL_INFO = 0x00000400;

    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

     * @hide

     */

     */

core/java/android/telephony/TelephonyRegistryManager.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -29,13 +29,13 @@ import android.os.Handler; 
import android.os.HandlerExecutor;

import android.os.HandlerExecutor;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.telephony.Annotation;

import android.telephony.Annotation.ApnType;

import android.telephony.Annotation.ApnType;

import android.telephony.Annotation.CallState;

import android.telephony.Annotation.CallState;

import android.telephony.Annotation.DataActivityType;

import android.telephony.Annotation.DataActivityType;

import android.telephony.Annotation.DataFailureCause;

import android.telephony.Annotation.DataFailureCause;

import android.telephony.Annotation.DataState;

import android.telephony.Annotation.DataState;

import android.telephony.Annotation.NetworkType;

import android.telephony.Annotation.NetworkType;

import android.telephony.Annotation.PreciseCallStates;

import android.telephony.Annotation.RadioPowerState;

import android.telephony.Annotation.RadioPowerState;

import android.telephony.Annotation.SimActivationState;

import android.telephony.Annotation.SimActivationState;

import android.telephony.Annotation.SrvccState;

import android.telephony.Annotation.SrvccState;
@@ -43,7 +43,6 @@ import android.telephony.CallQuality; 
import android.telephony.CellInfo;

import android.telephony.CellInfo;

import android.telephony.DisconnectCause;

import android.telephony.DisconnectCause;

import android.telephony.PhoneCapability;

import android.telephony.PhoneCapability;

import android.telephony.PreciseCallState.State;

import android.telephony.ServiceState;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SignalStrength;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;
@@ -624,8 +623,10 @@ public class TelephonyRegistryManager { 
     *

     *

     * @hide

     * @hide

     */

     */

    public void notifyPreciseCallState(int subId, int slotIndex, @State int ringCallPreciseState,

    public void notifyPreciseCallState(int subId, int slotIndex,

        @State int foregroundCallPreciseState, @State int backgroundCallPreciseState) {

        @PreciseCallStates int ringCallPreciseState,

        @PreciseCallStates int foregroundCallPreciseState,

        @PreciseCallStates int backgroundCallPreciseState) {

        try {

        try {

            sRegistry.notifyPreciseCallState(slotIndex, subId, ringCallPreciseState,

            sRegistry.notifyPreciseCallState(slotIndex, subId, ringCallPreciseState,

                foregroundCallPreciseState, backgroundCallPreciseState);

                foregroundCallPreciseState, backgroundCallPreciseState);

telecomm/java/android/telecom/Conference.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.Bundle;

import android.os.SystemClock;

import android.os.SystemClock;

import android.telecom.Connection.VideoProvider;

import android.telecom.Connection.VideoProvider;

import android.telephony.Annotation.RilRadioTechnology;

import android.telephony.ServiceState;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.util.ArraySet;

import android.util.ArraySet;

telecomm/java/android/telecom/Connection.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.Message; 
import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemClock;

import android.telephony.Annotation.RilRadioTechnology;

import android.telephony.ServiceState;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.util.ArraySet;

import android.util.ArraySet;

telephony/java/android/telephony/Annotation.java

+40 −0
Original line number Original line Diff line number Diff line
@@ -469,4 +469,44 @@ public class Annotation { 
    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface DataFailureCause {

    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 {}

}
 
}