commit e08ee6dfd2d848be188251066e1715f4eaf05b82
author Xiangyu/Malcolm Chen <refuhoo@google.com> Thu Mar 12 01:20:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 12 01:20:38 2020 +0000
tree 05ea6a9c4a235242bbb1ca7162d7e27fd59704b7
parent cfb121a5604b9f9dbb15e5c0e32d67c6f841d8b2
parent efafd1c8d4d4396dc02a8279848cdbef9e8705a8

Merge "Fix flakiness of testHasCarrierPrivilegesViaCarrierConfigs."

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index ef7f5b8..8098a61 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -596,6 +596,10 @@
             configToSend = mConfigFromDefaultApp[phoneId];
         }
 
+        if (configToSend == null) {
+            configToSend = new PersistableBundle();
+        }
+
         // mOverrideConfigs is for testing. And it will override current configs.
         PersistableBundle config = mOverrideConfigs[phoneId];
         if (config != null) {