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

Commit 045526da authored by Alan Stokes's avatar Alan Stokes Committed by Automerger Merge Worker
Browse files

Merge "Simplify ApexInfo classpath info" am: 3281d1b8 

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

Change-Id: I3cbfce7284868a805e47c2a1ebe9ca2db3142247
parents a9e06927 3281d1b8

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -1255,9 +1255,7 @@ public class StagingManager { 
                    info.diskImagePath = ai.modulePath;

                    info.diskImagePath = ai.modulePath;

                    info.versionCode = ai.versionCode;

                    info.versionCode = ai.versionCode;

                    info.versionName = ai.versionName;

                    info.versionName = ai.versionName;

                    info.hasBootClassPathJars = ai.hasBootClassPathJars;

                    info.hasClassPathJars = ai.hasClassPathJars;

                    info.hasDex2OatBootClassPathJars = ai.hasDex2OatBootClassPathJars;

                    info.hasSystemServerClassPathJars = ai.hasSystemServerClassPathJars;

                    return info;

                    return info;

                }

                }

            }

            }

tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -449,8 +449,7 @@ public class StagedInstallInternalTest { 
        // Query proper module name

        // Query proper module name

        result = getPackageManagerNative().getStagedApexInfo(TEST_APEX_PACKAGE_NAME);

        result = getPackageManagerNative().getStagedApexInfo(TEST_APEX_PACKAGE_NAME);

        assertThat(result.moduleName).isEqualTo(TEST_APEX_PACKAGE_NAME);

        assertThat(result.moduleName).isEqualTo(TEST_APEX_PACKAGE_NAME);

        assertThat(result.hasBootClassPathJars).isTrue();

        assertThat(result.hasClassPathJars).isTrue();

        assertThat(result.hasSystemServerClassPathJars).isTrue();

        InstallUtils.openPackageInstallerSession(sessionId).abandon();

        InstallUtils.openPackageInstallerSession(sessionId).abandon();

    }

    }