From e0ee6fe2c2b3f8222c567bf616f91243797c3071 Mon Sep 17 00:00:00 2001
From: Gavin Corkery <gavincorkery@google.com>
Date: Wed, 4 Dec 2019 10:59:34 +0000
Subject: [PATCH] Allow requested installer package name to be null

Since an installer package name may be null, switch to
TextUtils.equals to allow for this case and to stop
any NullPointerExceptions

Test: adb shell pm install --staged
      /system/app/CaptivePortalLogin/CaptivePortalLogin.apk works
Bug: 145575703

Change-Id: Ic30cc4610884657aaa8415dc96107c7cc3647ce9
---
 .../java/com/android/server/pm/PackageInstallerService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 93249e9e311c3..dceca0a749e33 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -494,7 +494,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
             }
             // Only apps with INSTALL_PACKAGES are allowed to set an installer that is not the
             // caller.
-            if (!requestedInstallerPackageName.equals(installerPackageName)) {
+            if (!TextUtils.equals(requestedInstallerPackageName, installerPackageName)) {
                 if (mContext.checkCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES)
                         != PackageManager.PERMISSION_GRANTED) {
                     mAppOps.checkPackage(callingUid, requestedInstallerPackageName);