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

Commit 2d41e533 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "No need to check product vndk version" into main am: 8fa8c076 am: b056db1d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2763005



Change-Id: I31baf8e11ab41f7992bf010bcd91bdd7507be0c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a55cc161 b056db1d

core/java/android/app/LoadedApk.java

+3 −8
Original line number Original line Diff line number Diff line
@@ -50,7 +50,6 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;

import android.security.net.config.NetworkSecurityConfigProvider;

import android.security.net.config.NetworkSecurityConfigProvider;

import android.sysprop.VndkProperties;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.AndroidRuntimeException;

import android.util.AndroidRuntimeException;

import android.util.ArrayMap;

import android.util.ArrayMap;
@@ -901,14 +900,10 @@ public final class LoadedApk { 
        }

        }





        // Similar to vendor apks, we should add /product/lib for apks from product partition

        // Similar to vendor apks, we should add /product/lib for apks from product partition

        // when product apps are marked as unbundled. We cannot use the same way from vendor

        // when product apps are marked as unbundled. Product is separated as long as the

        // to check if lib path exists because there is possibility that /product/lib would not

        // partition exists, so it can be handled with same approach from the vendor partition.

        // exist from legacy device while product apks are bundled. To make this clear, we use

        // "ro.product.vndk.version" property. If the property is defined, we regard all product

        // apks as unbundled.

        if (mApplicationInfo.getCodePath() != null

        if (mApplicationInfo.getCodePath() != null

                && mApplicationInfo.isProduct()

                && mApplicationInfo.isProduct()) {

                && VndkProperties.product_vndk_version().isPresent()) {

            isBundledApp = false;

            isBundledApp = false;

        }

        }