commit 4aaca8129db54b5d6cc889906817c9256e80f67b
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 07 03:10:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 07 03:10:25 2021 +0000
tree 1a5f4bc86ecb29ae4b0e93b36ebf36ad107e388e
parent 0004c5abafa9a17a89d6a36d0e8031ee4c1dc595
parent 9aaf4d1e5852da31b3689e8aaaa0d88ecaea0599

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

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

Change-Id: I195c2e7745e2c3abf98cca2eeb59ee595f6ec8ee

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 =