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

Commit 6dff86ba authored by Shikha Panwar's avatar Shikha Panwar
Browse files

PackageManagerNative: Include app's sourceDir 

Include the sourceDir of the application (if present) in the result of
getPackageInfoWithSigningInfo.

Additionally, add jajar rule to rename the exported class by the jar to
reduce possibility of multiple jars exporting this same symbol.

Requirement: virtualizationmachine service which uses native pm consumes
VM configuration supposed to contain the packagename of the apk. It
requires sourceDir of the apk to mount the package into Microdroid VM.

Test: adb shell service call package_native 2 s16 "com.android.microdroid.test" i32 0
Test: Compare above with `adb shell pm path com.android.microdroid.test`
Bug: 438179019
Flag: build.RELEASE_AVF_ENABLE_ADVANCE_MULTITENANCY
Change-Id: I91b31b9bf59bc970b6e262d7386ef8954efb2c84
parent a7236b7c

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ java_library_static { 
        "uprobestats_flags_java_lib",

        "clipboard_flags_lib",

        "aconfig_adbdauth_flags_java_lib",

        "AvfBuildFlags",

    ],

    javac_shard_size: 50,

    javacflags: [

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

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.content.pm.StagedApexInfo; 
import android.os.Binder;

import android.os.RemoteException;

import android.os.UserHandle;

import android.system.virtualmachine.BuildFlags;

import android.text.TextUtils;

import android.util.Slog;
@@ -82,6 +83,10 @@ final class PackageManagerNative extends IPackageManagerNative.Stub { 


        PackageInfoNative result = new PackageInfoNative();

        result.packageName = packageName;



        if (BuildFlags.SUPPORT_AVF_ADVANCE_MULTITENANCY && pInfo.applicationInfo != null) {

            result.sourceDir = pInfo.applicationInfo.sourceDir;

        }

        if (pInfo.signingInfo == null) {

            return result;

        }

services/core/services-jarjar-rules.txt

+2 −0
Original line number Diff line number Diff line 
# For profiling flags

rule android.os.profiling.** android.internal.os.profiling.@1

# AVF build flags

rule android.system.virtualmachine.BuildFlags** android.system.virtualmachine.AvfBuildFlags@1