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

Commit 0bd60517 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge changes from topics "cp_sip_transport_supported_api",... 

Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec785 am: 371361d9 am: 666fbf62

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

Change-Id: Ief02f6c15576358e18adf4869ad05653a55aa87a
parents cf96c50b 666fbf62

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -46887,6 +46887,7 @@ package android.telephony { 
  }















  public static final class CarrierConfigManager.Ims {













    field public static final String KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL = "ims.ims_single_registration_required_bool";















    field public static final String KEY_PREFIX = "ims.";















    field public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT = "ims.wifi_off_deferring_time_millis_int";















  }

























api/system-current.txt



+15
−0




























Original line number
Diff line number
Diff line








@@ -11904,6 +11904,10 @@ package android.telephony.ims {













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















  }



























  public class ImsManager {













    method @NonNull public android.telephony.ims.SipDelegateManager getSipDelegateManager(int);













  }



























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















    method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);















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










@@ -11939,10 +11943,13 @@ package android.telephony.ims {













    method public void disableIms(int);















    method public void enableIms(int);















    method public android.telephony.ims.stub.ImsConfigImplBase getConfig(int);













    method public long getImsServiceCapabilities();















    method public android.telephony.ims.stub.ImsRegistrationImplBase getRegistration(int);













    method @Nullable public android.telephony.ims.stub.SipTransportImplBase getSipTransport(int);















    method public final void onUpdateSupportedImsFeatures(android.telephony.ims.stub.ImsFeatureConfiguration) throws android.os.RemoteException;















    method public android.telephony.ims.stub.ImsFeatureConfiguration querySupportedImsFeatures();















    method public void readyForFeatureCreation();













    field public static final long CAPABILITY_SIP_DELEGATE_CREATION = 2L; // 0x2L















  }





























  public final class ImsSsData implements android.os.Parcelable {










@@ -12188,6 +12195,10 @@ package android.telephony.ims {













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















  }



























  public class SipDelegateManager {













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













  }



























}





























package android.telephony.ims.feature {










@@ -12437,6 +12448,10 @@ package android.telephony.ims.stub {













    method public int updateColr(int);















  }



























  public class SipTransportImplBase {













    ctor public SipTransportImplBase(@NonNull java.util.concurrent.Executor);













  }



























}





























package android.telephony.mbms {

























non-updatable-api/current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -45055,6 +45055,7 @@ package android.telephony {













  }





























  public static final class CarrierConfigManager.Ims {













    field public static final String KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL = "ims.ims_single_registration_required_bool";















    field public static final String KEY_PREFIX = "ims.";















    field public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT = "ims.wifi_off_deferring_time_millis_int";















  }

























non-updatable-api/system-current.txt



+15
−0




























Original line number
Diff line number
Diff line








@@ -10786,6 +10786,10 @@ package android.telephony.ims {













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















  }



























  public class ImsManager {













    method @NonNull public android.telephony.ims.SipDelegateManager getSipDelegateManager(int);













  }



























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















    method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);















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










@@ -10821,10 +10825,13 @@ package android.telephony.ims {













    method public void disableIms(int);















    method public void enableIms(int);















    method public android.telephony.ims.stub.ImsConfigImplBase getConfig(int);













    method public long getImsServiceCapabilities();















    method public android.telephony.ims.stub.ImsRegistrationImplBase getRegistration(int);













    method @Nullable public android.telephony.ims.stub.SipTransportImplBase getSipTransport(int);















    method public final void onUpdateSupportedImsFeatures(android.telephony.ims.stub.ImsFeatureConfiguration) throws android.os.RemoteException;















    method public android.telephony.ims.stub.ImsFeatureConfiguration querySupportedImsFeatures();















    method public void readyForFeatureCreation();













    field public static final long CAPABILITY_SIP_DELEGATE_CREATION = 2L; // 0x2L















  }





























  public final class ImsSsData implements android.os.Parcelable {










@@ -11070,6 +11077,10 @@ package android.telephony.ims {













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















  }



























  public class SipDelegateManager {













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













  }



























}





























package android.telephony.ims.feature {










@@ -11319,6 +11330,10 @@ package android.telephony.ims.stub {













    method public int updateColr(int);















  }



























  public class SipTransportImplBase {













    ctor public SipTransportImplBase(@NonNull java.util.concurrent.Executor);













  }



























}





























package android.telephony.mbms {

























telephony/api/system-current.txt



+15
−0




























Original line number
Diff line number
Diff line








@@ -1361,6 +1361,10 @@ package android.telephony.ims {













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















  }





























  public class ImsManager {













    method @NonNull public android.telephony.ims.SipDelegateManager getSipDelegateManager(int);













  }





























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















    method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);















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










@@ -1396,10 +1400,13 @@ package android.telephony.ims {













    method public void disableIms(int);















    method public void enableIms(int);















    method public android.telephony.ims.stub.ImsConfigImplBase getConfig(int);













    method public long getImsServiceCapabilities();















    method public android.telephony.ims.stub.ImsRegistrationImplBase getRegistration(int);













    method @Nullable public android.telephony.ims.stub.SipTransportImplBase getSipTransport(int);















    method public final void onUpdateSupportedImsFeatures(android.telephony.ims.stub.ImsFeatureConfiguration) throws android.os.RemoteException;















    method public android.telephony.ims.stub.ImsFeatureConfiguration querySupportedImsFeatures();















    method public void readyForFeatureCreation();













    field public static final long CAPABILITY_SIP_DELEGATE_CREATION = 2L; // 0x2L















  }































  public final class ImsSsData implements android.os.Parcelable {










@@ -1645,6 +1652,10 @@ package android.telephony.ims {













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















  }





























  public class SipDelegateManager {













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













  }





























}































package android.telephony.ims.feature {










@@ -1894,6 +1905,10 @@ package android.telephony.ims.stub {













    method public int updateColr(int);















  }





























  public class SipTransportImplBase {













    ctor public SipTransportImplBase(@NonNull java.util.concurrent.Executor);













  }





























}































package android.telephony.mbms {