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

Commit 35e40bd5 authored by Sanjana Sunil's avatar Sanjana Sunil Committed by Android (Google) Code Review
Browse files

Merge "Flag uses-sdk-library parsing changes" into main

parents 7bc0eb3b ffe320b4

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -537,6 +537,9 @@ public class ApkLiteParseUtils { 
                                    hasBindDeviceAdminPermission);

                            break;

                        case TAG_USES_SDK_LIBRARY:

                            if (!android.content.pm.Flags.sdkDependencyInstaller()) {

                                break;

                            }

                            String usesSdkLibName = parser.getAttributeValue(

                                    ANDROID_RES_NAMESPACE, "name");

                            long usesSdkLibVersionMajor = parser.getAttributeIntValue(

core/tests/coretests/src/android/content/pm/parsing/ApkLiteParseUtilsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.content.pm.parsing.result.ParseTypeImpl; 
import android.os.FileUtils;

import android.os.ParcelFileDescriptor;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.util.ArraySet;

import android.util.PackageUtils;
@@ -61,6 +62,7 @@ import java.util.List; 
import java.util.Set;



@Presubmit

@RequiresFlagsEnabled(android.content.pm.Flags.FLAG_SDK_DEPENDENCY_INSTALLER)

public class ApkLiteParseUtilsTest {



    @Rule