commit 89cc2c3b6fec1ae27b2e5bc1b162b54f2d4325ec
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 20 05:31:06 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 20 05:31:06 2023 +0000
tree c00af56e672be086bb61bc0f8c9b49d5a08ae8ef
parent 9f086e5d7a13df28cc21cc07fadcdb4f2e667258
parent 405a0e5bfa0f79bcd5ea064e282a5bbd7cf81e34

Merge "Handle ArrayIndexOutOfBoundsException for install_sessions.xml" into main

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

diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 02cf433..3036e0b 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -482,7 +482,7 @@
             }
         } catch (FileNotFoundException e) {
             // Missing sessions are okay, probably first boot
-        } catch (IOException | XmlPullParserException e) {
+        } catch (IOException | XmlPullParserException | ArrayIndexOutOfBoundsException e) {
             Slog.wtf(TAG, "Failed reading install sessions", e);
         } finally {
             IoUtils.closeQuietly(fis);