commit 79cb7e4361fd0e354c97a04d78258cdb3f709a87
author Xiangyu/Malcolm Chen <refuhoo@google.com> Wed Jan 08 23:51:48 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 08 23:51:48 2020 +0000
tree c94d2824ce8e28a59e0ea7f7d58108f394b520ed
parent fe1ec915327d9c1477205e3967813dde29dc1fe6
parent db33797d92d20126523f8203c657ebaf854c36dc

Merge changes from topics "141018421_set3", "146905502"

* changes:
  Rename sanitizeLocationInfo as we make it System API.
  For some scenarios where NOT_READY is a final / steady state. Clear config.

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index ce895a9..4d5f736 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -1048,6 +1048,7 @@
             case IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR:
             case IccCardConstants.INTENT_VALUE_ICC_CARD_RESTRICTED:
             case IccCardConstants.INTENT_VALUE_ICC_UNKNOWN:
+            case IccCardConstants.INTENT_VALUE_ICC_NOT_READY:
                 mHandler.sendMessage(mHandler.obtainMessage(EVENT_CLEAR_CONFIG, phoneId, -1));
                 break;
             case IccCardConstants.INTENT_VALUE_ICC_LOADED:

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5f7b627..ab83e1c 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6087,8 +6087,8 @@
             // Scrub out the location info in ServiceState depending on what level of access
             // the caller has.
             if (hasFinePermission) return ss;
-            if (hasCoarsePermission) return ss.sanitizeLocationInfo(false);
-            return ss.sanitizeLocationInfo(true);
+            if (hasCoarsePermission) return ss.createLocationInfoSanitizedCopy(false);
+            return ss.createLocationInfoSanitizedCopy(true);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }