From b06b10177d149c09ed9135ff95c25ae61d819447 Mon Sep 17 00:00:00 2001
From: Przemyslaw Szczepaniak <pszczepaniak@google.com>
Date: Thu, 4 Apr 2019 13:55:55 +0100
Subject: [PATCH] Remove PRODUCT_SERVICES from
 PackageManagerNative.getLocation.

It's not used in next android release and its causing issues
with cherry-picking to AOSP.

Bug: 120483623
Test: Flashed crosshatch, NNAPI cts tests
Change-Id: I98fda5751a7b1d2a6f3ad5b58682ad935fc30fa8
Merged-In: I98fda5751a7b1d2a6f3ad5b58682ad935fc30fa8
(cherry picked from commit e1f8449bdece70541e2bb3da3f95a508e775281f)
---
 .../java/com/android/server/pm/PackageManagerService.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 898437ddae415..7ff38685be070 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -23703,9 +23703,7 @@ public class PackageManagerService extends IPackageManager.Stub
             }
             return ((appInfo.isSystemApp() ? IPackageManagerNative.LOCATION_SYSTEM : 0)
                     | (appInfo.isVendor() ? IPackageManagerNative.LOCATION_VENDOR : 0)
-                    | (appInfo.isProduct() ? IPackageManagerNative.LOCATION_PRODUCT : 0)
-                    | (appInfo.isProductServices()
-                            ? IPackageManagerNative.LOCATION_PRODUCT_SERVICES : 0));
+                    | (appInfo.isProduct() ? IPackageManagerNative.LOCATION_PRODUCT : 0));
         }
     }