Merge changes from topics "imsservice subid notifications", "provisioning improvement", "provisioning_improvement_2" am: ff46fea55c

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

Change-Id: Ieadc7ebe5e1ef901ef31dee2fe9e558805219ccc
This commit is contained in:
Hakjun Choi
2022-02-09 03:04:05 +00:00
committed by Automerger Merge Worker

View File

@@ -488,9 +488,7 @@ public class RcsFeature extends ImsFeature {
* has already been created in the framework. * has already been created in the framework.
* @param listener A {@link CapabilityExchangeEventListener} to send the capability exchange * @param listener A {@link CapabilityExchangeEventListener} to send the capability exchange
* event to the framework. * event to the framework.
* @hide
*/ */
@SystemApi
private void initRcsCapabilityExchangeImplBase( private void initRcsCapabilityExchangeImplBase(
@NonNull CapabilityExchangeEventListener listener) { @NonNull CapabilityExchangeEventListener listener) {
synchronized (mLock) { synchronized (mLock) {