commit 8177bca20ba2b372827c56be6fa79469921cdfab
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 26 01:57:32 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 26 01:57:32 2024 +0000
tree 182bbe7818e301f7dbbeb292a664352b006e3711
parent 64a478585e1d6bfee7a74fd34181604cec6760db
parent 988917ae857c66b96cf36b77eb81f8274e218969

Merge "Catch AOB exception as it might indicate corrupted packages.xml." into main

services/core/java/com/android/server/pm/Settings.java

diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index a97652c..7e3254d 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -3437,7 +3437,7 @@
                 }
 
                 str.close();
-            } catch (IOException | XmlPullParserException e) {
+            } catch (IOException | XmlPullParserException | ArrayIndexOutOfBoundsException e) {
                 // Remove corrupted file and retry.
                 atomicFile.failRead(str, e);