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

Commit 9f431fa7 authored by Sungcheol Ahn's avatar Sungcheol Ahn Committed by Automerger Merge Worker
Browse files

Merge "[Telephony] Handling to cache the instance of BinderCacheManager when... 

Merge "[Telephony] Handling to cache the instance of BinderCacheManager when createForSubscriptionId is called" into tm-qpr-dev am: 28ecf3e1

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



Change-Id: I12b6458fb17b386c1309e79dc5275cf9b42168cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44631326 28ecf3e1

telephony/java/android/telephony/ims/ImsMmTelManager.java

+5 −2
Original line number Diff line number Diff line
@@ -223,6 +223,10 @@ public class ImsMmTelManager implements RegistrationManager { 
    private final int mSubId;

    private final BinderCacheManager<ITelephony> mBinderCache;



    // Cache Telephony Binder interfaces, one cache per process.

    private static final BinderCacheManager<ITelephony> sTelephonyCache =

            new BinderCacheManager<>(ImsMmTelManager::getITelephonyInterface);



    /**

     * Create an instance of {@link ImsMmTelManager} for the subscription id specified.

     *
@@ -251,8 +255,7 @@ public class ImsMmTelManager implements RegistrationManager { 
            throw new IllegalArgumentException("Invalid subscription ID");

        }



        return new ImsMmTelManager(subId, new BinderCacheManager<>(

                ImsMmTelManager::getITelephonyInterface));

        return new ImsMmTelManager(subId, sTelephonyCache);

    }



    /**