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

Commit 3ea20ab6 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "API Council Feedbacks" into rvc-dev am: cf5dc204 

Change-Id: I2934cfa1906ac7b71a3918a1cbfe41f273ceaaa5
parents 8c5bfc18 cf5dc204

core/java/android/os/ConfigUpdate.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package android.os;



import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;



/**
@@ -125,6 +127,7 @@ public final class ConfigUpdate { 
    */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.UPDATE_CONFIG)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB =

            "android.os.action.UPDATE_EMERGENCY_NUMBER_DB";

telephony/java/android/telephony/Annotation.java

+13 −0
Original line number Diff line number Diff line
@@ -571,6 +571,19 @@ public class Annotation { 
    public @interface PreciseDisconnectCauses {

    }



    /**

     * Carrier Privilege Status.

     */

    @IntDef(prefix = { "CARRIER_PRIVILEGE_STATUS_" }, value = {

        TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS,

        TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS,

        TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED,

        TelephonyManager.CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CarrierPrivilegeStatus {

    }



    @IntDef({

            Connection.AUDIO_CODEC_NONE,

            Connection.AUDIO_CODEC_AMR,

telephony/java/android/telephony/TelephonyManager.java

+2 −3
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import android.telecom.PhoneAccountHandle; 
import android.telecom.TelecomManager;

import android.telephony.Annotation.ApnType;

import android.telephony.Annotation.CallState;

import android.telephony.Annotation.CarrierPrivilegeStatus;

import android.telephony.Annotation.NetworkType;

import android.telephony.Annotation.RadioPowerState;

import android.telephony.Annotation.SimActivationState;
@@ -11162,8 +11163,6 @@ public class TelephonyManager { 
                retVal = telephony.isDataEnabled(subId);

        } catch (RemoteException e) {

            Log.e(TAG, "Error isDataConnectionAllowed", e);

        } catch (NullPointerException e) {

            return false;

        }

        return retVal;

    }
@@ -12452,7 +12451,7 @@ public class TelephonyManager { 
     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public int getCarrierPrivilegeStatus(int uid) {

    public @CarrierPrivilegeStatus int getCarrierPrivilegeStatus(int uid) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {