From ea34d76ff865f4bf811d503c1a5b3072ed6016d9 Mon Sep 17 00:00:00 2001
From: Collin Fijalkovich <cfijalkovich@google.com>
Date: Tue, 11 Feb 2020 13:49:07 -0800
Subject: [PATCH] Activate Telephony Service Handle Caching

The infrastructure for telephony handle caching was checked in in
ag/10255108, but disabled due to changes that needed to be made in AOSP.
This CL activates the caching.

Test: atest PhoneSubInfoControllerTest
Test: atest DcTrackerTest
Test: atest CellBroadcastConfigTest
Bug: 140788621
Change-Id: I42c829a07f9192ccbedef38e835019804eb20978
---
 telephony/java/android/telephony/TelephonyManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 15103bfb889d1..68b6683e54262 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -13135,7 +13135,7 @@ public class TelephonyManager {
     */
     static IPhoneSubInfo getSubscriberInfoService() {
         // Keeps cache disabled until test fixes are checked into AOSP.
-        if (true) {
+        if (!sServiceHandleCacheEnabled) {
             return IPhoneSubInfo.Stub.asInterface(
                 TelephonyFrameworkInitializer
                         .getTelephonyServiceManager()
@@ -13169,7 +13169,7 @@ public class TelephonyManager {
     */
     static ISub getSubscriptionService() {
         // Keeps cache disabled until test fixes are checked into AOSP.
-        if (true) {
+        if (!sServiceHandleCacheEnabled) {
             return ISub.Stub.asInterface(
                     TelephonyFrameworkInitializer
                             .getTelephonyServiceManager()
@@ -13203,7 +13203,7 @@ public class TelephonyManager {
     */
     static ISms getSmsService() {
         // Keeps cache disabled until test fixes are checked into AOSP.
-        if (true) {
+        if (!sServiceHandleCacheEnabled) {
             return ISms.Stub.asInterface(
                     TelephonyFrameworkInitializer
                             .getTelephonyServiceManager()