commit f4aab17609760b35454e6f673f880a6477d6f18f
author Meng Wang <mewan@google.com> Wed Apr 14 20:23:42 2021 -0700
committer Jack Nudelman <jacknudelman@google.com> Thu May 06 21:18:53 2021 +0000
tree db16ec022b3661b9cfbc36c1bed2f6114a703023
parent 4142b4600af7214c85d2cac66de2218ac3b6dbd7

Fix crash due to modifying immutable PersistableBundle

Bug: 185261314
Test: make
Change-Id: Ibe6ead59b647b0983516e648d2848e2daa56bf31
Merged-In: Ibe6ead59b647b0983516e648d2848e2daa56bf31

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 =