Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50b03113 authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak
Browse files

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 e1f8449b)
parent 02d8a7c5

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

+1 −3
Original line number Diff line number Diff line
@@ -23947,9 +23947,7 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 
            }

            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));

        }

    }