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

Commit 2e1f54fa authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Move to ACCESS_RCS_USER_CAPABILITY_EXCHANGE for UCE APIs" into sc-dev am: 4597584e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13592356

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4e3b1bdee79a8cac927bdf85994728571d9fd27
parents c604c340 4597584e

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -13459,8 +13459,8 @@ package android.telephony.ims { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void addOnPublishStateChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RcsUceAdapter.OnPublishStateChangedListener) throws android.telephony.ims.ImsException;

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getUcePublishState() throws android.telephony.ims.ImsException;

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void removeOnPublishStateChangedListener(@NonNull android.telephony.ims.RcsUceAdapter.OnPublishStateChangedListener) throws android.telephony.ims.ImsException;

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void requestAvailability(@NonNull android.net.Uri, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RcsUceAdapter.CapabilitiesCallback) throws android.telephony.ims.ImsException;

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void requestCapabilities(@NonNull java.util.List<android.net.Uri>, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RcsUceAdapter.CapabilitiesCallback) throws android.telephony.ims.ImsException;

    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE, android.Manifest.permission.READ_CONTACTS}) public void requestAvailability(@NonNull android.net.Uri, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RcsUceAdapter.CapabilitiesCallback) throws android.telephony.ims.ImsException;

    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE, android.Manifest.permission.READ_CONTACTS}) public void requestCapabilities(@NonNull java.util.List<android.net.Uri>, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RcsUceAdapter.CapabilitiesCallback) throws android.telephony.ims.ImsException;

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean) throws android.telephony.ims.ImsException;

    field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2

    field public static final int CAPABILITY_UPDATE_TRIGGER_ETAG_EXPIRED = 1; // 0x1

telephony/java/android/telephony/ims/RcsUceAdapter.java

+7 −4
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.telephony.TelephonyFrameworkInitializer; 
import android.telephony.ims.aidl.IImsRcsController;

import android.telephony.ims.aidl.IRcsUceControllerCallback;

import android.telephony.ims.aidl.IRcsUcePublishStateCallback;

import android.telephony.ims.feature.RcsFeature;

import android.util.Log;



import java.lang.annotation.Retention;
@@ -467,7 +468,7 @@ public class RcsUceAdapter { 
     * poll on the network unless there are contacts being queried with stale information.

     * <p>

     * Be sure to check the availability of this feature using

     * {@link ImsRcsManager#isAvailable(int)} and ensuring

     * {@link ImsRcsManager#isAvailable(int, int)} and ensuring

     * {@link RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_OPTIONS_UCE} or

     * {@link RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_PRESENCE_UCE} is enabled or else

     * this operation will fail with {@link #ERROR_NOT_AVAILABLE} or {@link #ERROR_NOT_ENABLED}.
@@ -484,7 +485,8 @@ public class RcsUceAdapter { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @RequiresPermission(allOf = {Manifest.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE,

            Manifest.permission.READ_CONTACTS})

    public void requestCapabilities(@NonNull List<Uri> contactNumbers,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull CapabilitiesCallback c) throws ImsException {
@@ -557,7 +559,7 @@ public class RcsUceAdapter { 
     *

     * <p>

     * Be sure to check the availability of this feature using

     * {@link ImsRcsManager#isAvailable(int)} and ensuring

     * {@link ImsRcsManager#isAvailable(int, int)} and ensuring

     * {@link RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_OPTIONS_UCE} or

     * {@link RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_PRESENCE_UCE} is

     * enabled or else this operation will fail with
@@ -571,7 +573,8 @@ public class RcsUceAdapter { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @RequiresPermission(allOf = {Manifest.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE,

            Manifest.permission.READ_CONTACTS})

    public void requestAvailability(@NonNull Uri contactNumber,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull CapabilitiesCallback c) throws ImsException {