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

Commit 8e0f0ea4 authored by Hakjun Choi's avatar Hakjun Choi Committed by Automerger Merge Worker
Browse files

Merge changes from topics "imsservice subid notifications", "provisioning... 

Merge changes from topics "imsservice subid notifications", "provisioning improvement", "provisioning_improvement_2" am: ff46fea5 am: 130217ec

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

Change-Id: I6cf94dadddceb947a96caa4cd369a780d8bd578e
parents 657257a9 130217ec

telephony/java/android/telephony/ims/feature/RcsFeature.java

+0 −2
Original line number Diff line number Diff line
@@ -488,9 +488,7 @@ public class RcsFeature extends ImsFeature { 
     * has already been created in the framework.

     * @param listener A {@link CapabilityExchangeEventListener} to send the capability exchange

     * event to the framework.

     * @hide

     */

    @SystemApi

    private void initRcsCapabilityExchangeImplBase(

            @NonNull CapabilityExchangeEventListener listener) {

        synchronized (mLock) {