From 9d5b4df6d775c91a14f29c21fc8b219496aabb86 Mon Sep 17 00:00:00 2001
From: Winson <chiuwinson@google.com>
Date: Tue, 7 Jan 2020 15:26:22 -0800
Subject: [PATCH] Throw IOException when checking if invalid target defines
 overlayable

PackageInfo can be null for cases where the target is missing, and
this should not crash in those cases. Mirrors the behavior of
getOverlayableForTarget by converting null to an IOException.

Bug: 147255897

Change-Id: I345dc68b7e6bea65f3f5da7a49a9136e07ba3793
---
 .../java/com/android/server/om/OverlayManagerService.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index f1947ac15645f..b782ca96ae882 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -1154,6 +1154,10 @@ public final class OverlayManagerService extends SystemService {
                 throws RemoteException, IOException {
             PackageInfo packageInfo = mPackageManager.getPackageInfo(targetPackageName, 0,
                     userId);
+            if (packageInfo == null) {
+                throw new IOException("Unable to get target package");
+            }
+
             String baseCodePath = packageInfo.applicationInfo.getBaseCodePath();
 
             ApkAssets apkAssets = null;