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

Commit 1da17936 authored by Samiul Islam's avatar Samiul Islam
Browse files

Revert "Flag uses-sdk-library parsing changes" 

This reverts commit ffe320b4.

Reason for revert: b/380156915#comment21

The logic is being accessed in early boot phase where the flag is not available. The flag guard was added because some apps had "String" versionMajor in their manifest and were failing to get installed. We have merged a work around to handle String versionMajor in Ie2a9809b49b4c7cd9136d610e98e6bd15a660ce6, so it should be fine to remove the flag guard.

Bug: 380156915
Test: presubmit
Flag: EXEMPT Flag unavailable in early boot
Change-Id: I8c22c903e5ae388a56c49fcf15c313049f3e6dd3
parent ffe320b4

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

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

                                    hasBindDeviceAdminPermission);

                            break;

                            break;

                        case TAG_USES_SDK_LIBRARY:

                        case TAG_USES_SDK_LIBRARY:

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

                                break;

                            }

                            String usesSdkLibName = parser.getAttributeValue(

                            String usesSdkLibName = parser.getAttributeValue(

                                    ANDROID_RES_NAMESPACE, "name");

                                    ANDROID_RES_NAMESPACE, "name");

                            long usesSdkLibVersionMajor = parser.getAttributeIntValue(

                            long usesSdkLibVersionMajor = parser.getAttributeIntValue(

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

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

import android.os.FileUtils;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.PackageUtils;

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

import java.util.Set;





@Presubmit

@Presubmit

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

public class ApkLiteParseUtilsTest {

public class ApkLiteParseUtilsTest {





    @Rule

    @Rule