commit 8237b23140d69dba9feb6756b8281f7c938a2ad1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Aug 31 01:22:22 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Aug 31 01:22:22 2024 +0000
tree 4b8edfdad8fd5424dfe6a989b1671fe76c5998b2
parent d019efd17b533b2119d69d13522beed7c72df527
parent f6ce74c757a777cd1d61052a52ee62efe154291b

Snap for 12304452 from f6ce74c757a777cd1d61052a52ee62efe154291b to 24Q4-release

Change-Id: I6ae50fe7a81841eedc0f3c105f40444a9144ad35

Android.bp

diff --git a/Android.bp b/Android.bp
index 94654a6..0d1c81d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -84,9 +84,9 @@
         "tests/res",
     ],
     libs: [
-        "android.test.mock",
-        "android.test.base",
-        "android.test.runner",
+        "android.test.mock.stubs.system",
+        "android.test.base.stubs.system",
+        "android.test.runner.stubs.system",
     ],
 
     jni_libs: [

src/com/android/server/telecom/settings/BlockedNumbersUtil.java

diff --git a/src/com/android/server/telecom/settings/BlockedNumbersUtil.java b/src/com/android/server/telecom/settings/BlockedNumbersUtil.java
index 3e1da17..99c5746 100644
--- a/src/com/android/server/telecom/settings/BlockedNumbersUtil.java
+++ b/src/com/android/server/telecom/settings/BlockedNumbersUtil.java
@@ -133,9 +133,12 @@
     public static boolean isEnhancedCallBlockingEnabledByPlatform(Context context) {
         CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(
                 Context.CARRIER_CONFIG_SERVICE);
-        PersistableBundle carrierConfig = configManager.getConfig();
+        PersistableBundle carrierConfig = null;
+        if (configManager != null) {
+            carrierConfig = configManager.getConfig();
+        }
         if (carrierConfig == null) {
-            carrierConfig = configManager.getDefaultConfig();
+            carrierConfig = CarrierConfigManager.getDefaultConfig();
         }
         return carrierConfig.getBoolean(
                 CarrierConfigManager.KEY_SUPPORT_ENHANCED_CALL_BLOCKING_BOOL)