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

Commit 10327316 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Add new @SystemApis for RCS dependencies 

As part of mainline, remove telephony dependencies from RcsService
and PresencePolling apps.

Bug: 147319232
Test: atest CtsTelephonyTestCases
Merged-in: Id25bfffc1c40db8b183206dc598165272da7356c
Change-Id: Id25bfffc1c40db8b183206dc598165272da7356c
parent 7304f015

api/system-current.txt

+57 −0
Original line number Diff line number Diff line
@@ -9089,6 +9089,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();

    method public int getEmergencyNumberDbVersion();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getIsimImpu();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();

    method public int getMaxNumberOfSimultaneouslyActiveSims();
@@ -9765,6 +9766,7 @@ package android.telephony.ims { 
  public class ImsManager {

    method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);

    method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);

    field public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";

  }















  public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {










@@ -10064,8 +10066,22 @@ package android.telephony.ims {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int, boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);













    field public static final int KEY_EAB_PROVISIONING_STATUS = 25; // 0x19













    field public static final int KEY_RCS_AVAILABILITY_CACHE_EXPIRATION_SEC = 19; // 0x13













    field public static final int KEY_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC = 18; // 0x12













    field public static final int KEY_RCS_CAPABILITIES_POLL_INTERVAL_SEC = 20; // 0x14













    field public static final int KEY_RCS_CAPABILITY_DISCOVERY_ENABLED = 17; // 0x11













    field public static final int KEY_RCS_CAPABILITY_POLL_LIST_SUB_EXP_SEC = 23; // 0x17













    field public static final int KEY_RCS_MAX_NUM_ENTRIES_IN_RCL = 22; // 0x16













    field public static final int KEY_RCS_PUBLISH_SOURCE_THROTTLE_MS = 21; // 0x15













    field public static final int KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC = 16; // 0x10













    field public static final int KEY_RCS_PUBLISH_TIMER_SEC = 15; // 0xf













    field public static final int KEY_T1_TIMER_VALUE_MS = 7; // 0x7















    field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b















    field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a













    field public static final int KEY_VOLTE_PROVISIONING_STATUS = 10; // 0xa













    field public static final int KEY_VT_PROVISIONING_STATUS = 11; // 0xb













    field public static final int PROVISIONING_RESULT_UNKNOWN = -1; // 0xffffffff















    field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0















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















    field public static final String STRING_QUERY_RESULT_ERROR_GENERIC = "STRING_QUERY_RESULT_ERROR_GENERIC";









@@ -10078,6 +10094,47 @@ package android.telephony.ims {













    method public void onProvisioningStringChanged(int, @NonNull String);















  }



























  public final class RcsContactUceCapability implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.List<java.lang.String> getCapableExtensionTags();













    method @NonNull public android.net.Uri getContactUri();













    method @Nullable public android.net.Uri getServiceUri(int);













    method public boolean isCapable(int);













    method public boolean isCapable(@NonNull String);













    method public void writeToParcel(@NonNull android.os.Parcel, int);













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













    field public static final int CAPABILITY_CHAT_SESSION_STORE_FORWARD = 4; // 0x4













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













    field public static final int CAPABILITY_DISCOVERY_VIA_PRESENCE = 4096; // 0x1000













    field public static final int CAPABILITY_FILE_TRANSFER = 8; // 0x8













    field public static final int CAPABILITY_FILE_TRANSFER_HTTP = 64; // 0x40













    field public static final int CAPABILITY_FILE_TRANSFER_SMS = 128; // 0x80













    field public static final int CAPABILITY_FILE_TRANSFER_STORE_FORWARD = 32; // 0x20













    field public static final int CAPABILITY_FILE_TRANSFER_THUMBNAIL = 16; // 0x10













    field public static final int CAPABILITY_GEOLOCATION_PULL = 131072; // 0x20000













    field public static final int CAPABILITY_GEOLOCATION_PULL_FILE_TRANSFER = 262144; // 0x40000













    field public static final int CAPABILITY_GEOLOCATION_PUSH = 32768; // 0x8000













    field public static final int CAPABILITY_GEOLOCATION_PUSH_SMS = 65536; // 0x10000













    field public static final int CAPABILITY_IMAGE_SHARE = 256; // 0x100













    field public static final int CAPABILITY_IP_VIDEO_CALL = 16384; // 0x4000













    field public static final int CAPABILITY_IP_VOICE_CALL = 8192; // 0x2000













    field public static final int CAPABILITY_RCS_VIDEO_CALL = 1048576; // 0x100000













    field public static final int CAPABILITY_RCS_VIDEO_ONLY_CALL = 2097152; // 0x200000













    field public static final int CAPABILITY_RCS_VOICE_CALL = 524288; // 0x80000













    field public static final int CAPABILITY_SOCIAL_PRESENCE = 2048; // 0x800













    field public static final int CAPABILITY_VIDEO_SHARE = 1024; // 0x400













    field public static final int CAPABILITY_VIDEO_SHARE_DURING_CS_CALL = 512; // 0x200













    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.RcsContactUceCapability> CREATOR;













  }

























  public static class RcsContactUceCapability.Builder {













    ctor public RcsContactUceCapability.Builder(@NonNull android.net.Uri);













    method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(int, @NonNull android.net.Uri);













    method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(int);













    method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(@NonNull String);













    method @NonNull public android.telephony.ims.RcsContactUceCapability build();













  }



























  public interface RegistrationManager {















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

























api/test-current.txt



+15
−0




























Original line number
Diff line number
Diff line








@@ -3283,6 +3283,7 @@ package android.telephony.ims {













  public class ImsManager {















    method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);















    method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);













    field public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";















  }































  public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {










@@ -3578,8 +3579,22 @@ package android.telephony.ims {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(@android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability int, int, boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);















    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);













    field public static final int KEY_EAB_PROVISIONING_STATUS = 25; // 0x19













    field public static final int KEY_RCS_AVAILABILITY_CACHE_EXPIRATION_SEC = 19; // 0x13













    field public static final int KEY_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC = 18; // 0x12













    field public static final int KEY_RCS_CAPABILITIES_POLL_INTERVAL_SEC = 20; // 0x14













    field public static final int KEY_RCS_CAPABILITY_DISCOVERY_ENABLED = 17; // 0x11













    field public static final int KEY_RCS_CAPABILITY_POLL_LIST_SUB_EXP_SEC = 23; // 0x17













    field public static final int KEY_RCS_MAX_NUM_ENTRIES_IN_RCL = 22; // 0x16













    field public static final int KEY_RCS_PUBLISH_SOURCE_THROTTLE_MS = 21; // 0x15













    field public static final int KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC = 16; // 0x10













    field public static final int KEY_RCS_PUBLISH_TIMER_SEC = 15; // 0xf













    field public static final int KEY_T1_TIMER_VALUE_MS = 7; // 0x7















    field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b















    field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a













    field public static final int KEY_VOLTE_PROVISIONING_STATUS = 10; // 0xa













    field public static final int KEY_VT_PROVISIONING_STATUS = 11; // 0xb













    field public static final int PROVISIONING_RESULT_UNKNOWN = -1; // 0xffffffff















    field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0















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















    field public static final String STRING_QUERY_RESULT_ERROR_GENERIC = "STRING_QUERY_RESULT_ERROR_GENERIC";

































telephony/java/android/telephony/ImsManager.java



+22
−1




























Original line number
Diff line number
Diff line








@@ -17,6 +17,8 @@













package android.telephony.ims;































import android.annotation.NonNull;













import android.annotation.SdkConstant;













import android.annotation.SuppressLint;















import android.annotation.SystemApi;















import android.annotation.SystemService;















import android.annotation.TestApi;









@@ -35,7 +37,26 @@ public class ImsManager {





























    private Context mContext;





























    /** @hide */













    /**













     * <p>Broadcast Action: Indicates that an IMS operation was rejected by the network due to it













     * not being authorized on the network.













     * May include the {@link SubscriptionManager#EXTRA_SUBSCRIPTION_INDEX} extra to also specify













     * which subscription the operation was rejected for.













     * <p class="note">













     * Carrier applications may listen to this broadcast to be notified of possible IMS provisioning













     * issues.













     */













    // Moved from TelephonyIntents, need to keep backwards compatibility with OEM apps that have













    // this value hard-coded in BroadcastReceiver.













    @SuppressLint("ActionValue")













    @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)













    public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION =













            "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";



























    /**













     * Use {@link Context#getSystemService(String)} to get an instance of this class.













     * @hide













     */















    public ImsManager(@NonNull Context context) {















        mContext = context;















    }

































telephony/java/android/telephony/TelephonyManager.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -4932,7 +4932,9 @@ public class TelephonyManager {













     *      not present or not loaded















     * @hide















     */













    @UnsupportedAppUsage













    @Nullable













    @SystemApi













    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    public String[] getIsimImpu() {















        try {















            IPhoneSubInfo info = getSubscriberInfo();

































telephony/java/android/telephony/ims/ImsRcsManager.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -28,6 +28,7 @@ import android.os.IBinder;













import android.os.RemoteException;















import android.os.ServiceManager;















import android.telephony.AccessNetworkConstants;













import android.telephony.SubscriptionManager;















import android.telephony.ims.aidl.IImsCapabilityCallback;















import android.telephony.ims.aidl.IImsRcsController;















import android.telephony.ims.feature.ImsFeature;