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

Commit 377c221e authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Cache ITelephony service." am: 06d8ceab 

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

Change-Id: Idc6f552709437422cde8d8b192eae0bd8904e3d6
parents 699b3812 06d8ceab

telephony/java/android/telephony/TelephonyManager.java

+41 −9
Original line number Diff line number Diff line
@@ -304,6 +304,8 @@ public class TelephonyManager { 
    /** @hide */

    private static boolean sServiceHandleCacheEnabled = true;













    @GuardedBy("sCacheLock")













    private static ITelephony sITelephony;















    @GuardedBy("sCacheLock")















    private static IPhoneSubInfo sIPhoneSubInfo;















    @GuardedBy("sCacheLock")










@@ -5509,8 +5511,34 @@ public class TelephonyManager {













     */















    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)















    private ITelephony getITelephony() {













        return ITelephony.Stub.asInterface(TelephonyFrameworkInitializer













                .getTelephonyServiceManager().getTelephonyServiceRegisterer().get());













        // Keeps cache disabled until test fixes are checked into AOSP.













        if (!sServiceHandleCacheEnabled) {













            return ITelephony.Stub.asInterface(













                    TelephonyFrameworkInitializer













                            .getTelephonyServiceManager()













                            .getTelephonyServiceRegisterer()













                            .get());













        }

























        if (sITelephony == null) {













            ITelephony temp = ITelephony.Stub.asInterface(













                    TelephonyFrameworkInitializer













                            .getTelephonyServiceManager()













                            .getTelephonyServiceRegisterer()













                            .get());













            synchronized (sCacheLock) {













                if (sITelephony == null && temp != null) {













                    try {













                        sITelephony = temp;













                        sITelephony.asBinder().linkToDeath(sServiceDeath, 0);













                    } catch (Exception e) {













                        // something has gone horribly wrong













                        sITelephony = null;













                    }













                }













            }













        }













        return sITelephony;















    }





























    private IOns getIOns() {










@@ -13444,6 +13472,10 @@ public class TelephonyManager {













    */















    private static void resetServiceCache() {















        synchronized (sCacheLock) {













            if (sITelephony != null) {













                sITelephony.asBinder().unlinkToDeath(sServiceDeath, 0);













                sITelephony = null;













            }















            if (sISub != null) {















                sISub.asBinder().unlinkToDeath(sServiceDeath, 0);















                sISub = null;