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

Commit 3386e7bd authored by Artur Satayev's avatar Artur Satayev Committed by android-build-merger
Browse files

Merge "Add @UnsupportedAppUsage annotations for greylist." am: be1393d6 

am: c5178397

Change-Id: I9f884f482e4622b3588488a97662f7e205fca9c3
parents 8e42276a c5178397

src/java/com/android/internal/telephony/Call.java

+23 −5
Original line number Diff line number Diff line
@@ -16,25 +16,43 @@ 


package com.android.internal.telephony;



import android.annotation.UnsupportedAppUsage;

import android.telecom.ConferenceParticipant;

import android.telephony.Rlog;



import java.util.ArrayList;

import java.util.List;



import android.annotation.UnsupportedAppUsage;

import android.telephony.Rlog;



/**

 * {@hide}

 */

public abstract class Call {

    protected final String LOG_TAG = "Call";



    /* Enums */

    @UnsupportedAppUsage

    public Call() {

    }



    /* Enums */

    @UnsupportedAppUsage(implicitMember = "values()[Lcom/android/internal/telephony/Call$State;")

    public enum State {

        @UnsupportedAppUsage

        IDLE, ACTIVE, HOLDING, DIALING, ALERTING, INCOMING, WAITING, DISCONNECTED, DISCONNECTING;

        IDLE,

        ACTIVE,

        @UnsupportedAppUsage

        HOLDING,

        @UnsupportedAppUsage

        DIALING,

        @UnsupportedAppUsage

        ALERTING,

        @UnsupportedAppUsage

        INCOMING,

        @UnsupportedAppUsage

        WAITING,

        @UnsupportedAppUsage

        DISCONNECTED,

        @UnsupportedAppUsage

        DISCONNECTING;



        @UnsupportedAppUsage

        public boolean isAlive() {

src/java/com/android/internal/telephony/CallForwardInfo.java

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ import android.telecom.Log; 
public class CallForwardInfo {

    private static final String TAG = "CallForwardInfo";



    @UnsupportedAppUsage

    public CallForwardInfo() {

    }



    @UnsupportedAppUsage

    public int             status;      /*1 = active, 0 = not active */

    @UnsupportedAppUsage

src/java/com/android/internal/telephony/CallTracker.java

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ public abstract class CallTracker extends Handler { 
    protected static final int EVENT_THREE_WAY_DIAL_L2_RESULT_CDMA = 16;

    protected static final int EVENT_THREE_WAY_DIAL_BLANK_FLASH    = 20;



    @UnsupportedAppUsage

    public CallTracker() {

    }



    protected void pollCallsWhenSafe() {

        mNeedsPoll = true;

src/java/com/android/internal/telephony/DriverCall.java

+3 −2
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
package com.android.internal.telephony;



import android.annotation.UnsupportedAppUsage;

import android.telephony.Rlog;

import java.lang.Comparable;

import android.telephony.PhoneNumberUtils;

import android.telephony.Rlog;



/**

 * {@hide}
@@ -27,6 +26,8 @@ import android.telephony.PhoneNumberUtils; 
public class DriverCall implements Comparable<DriverCall> {

    static final String LOG_TAG = "DriverCall";



    @UnsupportedAppUsage(implicitMember =

            "values()[Lcom/android/internal/telephony/DriverCall$State;")

    public enum State {

        @UnsupportedAppUsage

        ACTIVE,

src/java/com/android/internal/telephony/IIccPhoneBook.aidl

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ interface IIccPhoneBook { 
     * @param efid the EF id of a ADN-like SIM

     * @return List of AdnRecord

     */

    @UnsupportedAppUsage

    List<AdnRecord> getAdnRecordsInEf(int efid);



    /**
@@ -40,6 +41,7 @@ interface IIccPhoneBook { 
     * @param subId user preferred subId

     * @return List of AdnRecord

     */

    @UnsupportedAppUsage

    List<AdnRecord> getAdnRecordsInEfForSubscriber(int subId, int efid);



    /**
@@ -60,6 +62,7 @@ interface IIccPhoneBook { 
     * @param pin2 required to update EF_FDN, otherwise must be null

     * @return true for success

     */

    @UnsupportedAppUsage

    boolean updateAdnRecordsInEfBySearch(int efid,

            String oldTag, String oldPhoneNumber,

            String newTag, String newPhoneNumber,
@@ -138,6 +141,7 @@ interface IIccPhoneBook { 
     *            recordSizes[1]  is the total length of the EF file

     *            recordSizes[2]  is the number of records in the EF file

     */

    @UnsupportedAppUsage

    int[] getAdnRecordsSize(int efid);



    /**
@@ -150,6 +154,7 @@ interface IIccPhoneBook { 
     *            recordSizes[1]  is the total length of the EF file

     *            recordSizes[2]  is the number of records in the EF file

     */

    @UnsupportedAppUsage

    int[] getAdnRecordsSizeForSubscriber(int subId, int efid);



}