commit 9aaf4d1e5852da31b3689e8aaaa0d88ecaea0599
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 07 02:00:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 07 02:00:02 2021 +0000
tree db16ec022b3661b9cfbc36c1bed2f6114a703023
parent 7306502bc456be318abd9a3e5ed2c20eaa6b0608
parent 706b376fb7bdb66f9f72ac981bfc487152c943dd

Merge "Fix crash due to modifying immutable PersistableBundle" am: 706b376fb7

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1698933

Change-Id: I3aeb3cc8c13f1606c53400aba8b686cfe5324b41

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 5382363..1d72a28 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -3218,10 +3218,11 @@
                 selection,
                 selectionArgs,
                 ORDER_BY_SUB_ID)) {
-            findAndRestoreAllMatches(bundle, cursor, restoreCase);
+            findAndRestoreAllMatches(bundle.deepCopy(), cursor, restoreCase);
         }
     }
 
+    // backedUpDataBundle must to be mutable
     private void findAndRestoreAllMatches(PersistableBundle backedUpDataBundle, Cursor cursor,
             int restoreCase) {
         int[] previouslyRestoredSubIdsArray =