summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Buynytskyy <alexbuy@google.com> 2023-06-03 15:10:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-03 15:10:22 +0000
commit1ab6be2b0f1d1f9e5208e5564e33572235c0b6c5 (patch)
treee6fbfb80655117380e4e3d0b5b345c6d064f3736
parentd2a6fce71f1c0f19fc0c43cf4e67781fae9b8aa1 (diff)
parentdcb180d75fd2aa2e0086f375d31837d9f3093817 (diff)
Merge "Handle ArrayIndexOutOfBoundsException for install_sessions.xml" into udc-dev am: af7ef7eb00 am: dcb180d75f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23492099 Change-Id: I7985f08e86a73e12025ed0421e7c3728183987e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/pm/PackageInstallerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 6491fd1b1f98..a9115371413c 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -511,7 +511,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
}
} 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);