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

Commit edb21629 authored by JW Wang's avatar JW Wang Committed by Android (Google) Code Review
Browse files

Merge changes Ie06eadfe,I71899224 

* changes:
  getVersionedPackage can't see packages installed on the 2nd user
  Pass correct install user when creating sessions
parents 46ff283d 3bf53c60

services/core/java/com/android/server/PackageWatchdog.java

+23 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
import android.annotation.IntDef;

import android.annotation.Nullable;

import android.content.Context;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.VersionedPackage;

import android.net.ConnectivityModuleConnector;
@@ -306,6 +307,8 @@ public class PackageWatchdog { 
            MonitoredPackage pkg = newMonitoredPackage(packageNames.get(i), durationMs, false);

            if (pkg != null) {

                packages.add(pkg);

            } else {

                Slog.w(TAG, "Failed to create MonitoredPackage for pkg=" + packageNames.get(i));

            }

        }
@@ -861,6 +864,25 @@ public class PackageWatchdog { 
        });

    }



    /**

     * Gets PackageInfo for the given package. Matches any user and apex.

     *

     * @throws PackageManager.NameNotFoundException if no such package is installed.

     */

    private PackageInfo getPackageInfo(String packageName)

            throws PackageManager.NameNotFoundException {

        PackageManager pm = mContext.getPackageManager();

        try {

            // The MATCH_ANY_USER flag doesn't mix well with the MATCH_APEX

            // flag, so make two separate attempts to get the package info.

            // We don't need both flags at the same time because we assume

            // apex files are always installed for all users.

            return pm.getPackageInfo(packageName, PackageManager.MATCH_ANY_USER);

        } catch (PackageManager.NameNotFoundException e) {

            return pm.getPackageInfo(packageName, PackageManager.MATCH_APEX);

        }

    }



    @Nullable

    private VersionedPackage getVersionedPackage(String packageName) {

        final PackageManager pm = mContext.getPackageManager();
@@ -868,8 +890,7 @@ public class PackageWatchdog { 
            return null;

        }

        try {

            final long versionCode = pm.getPackageInfo(

                    packageName, 0 /* flags */).getLongVersionCode();

            final long versionCode = getPackageInfo(packageName).getLongVersionCode();

            return new VersionedPackage(packageName, versionCode);

        } catch (PackageManager.NameNotFoundException e) {

            return null;

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

+2 −4
Original line number Diff line number Diff line
@@ -738,7 +738,6 @@ public class StagingManager { 
        PackageInstaller.SessionParams params = originalSession.params.copy();

        params.isStaged = false;

        params.installFlags |= PackageManager.INSTALL_STAGED;

        // TODO(b/129744602): use the userid from the original session.

        if (preReboot) {

            params.installFlags &= ~PackageManager.INSTALL_ENABLE_ROLLBACK;

            params.installFlags |= PackageManager.INSTALL_DRY_RUN;
@@ -748,7 +747,7 @@ public class StagingManager { 
        try {

            int apkSessionId = mPi.createSession(

                    params, originalSession.getInstallerPackageName(),

                    originalSession.getInstallerAttributionTag(), 0 /* UserHandle.SYSTEM */);

                    originalSession.getInstallerAttributionTag(), originalSession.userId);

            PackageInstallerSession apkSession = mPi.getSession(apkSessionId);

            apkSession.open();

            for (int i = 0, size = apkFilePaths.size(); i < size; i++) {
@@ -806,10 +805,9 @@ public class StagingManager { 
            if (preReboot) {

                params.installFlags &= ~PackageManager.INSTALL_ENABLE_ROLLBACK;

            }

            // TODO(b/129744602): use the userid from the original session.

            final int apkParentSessionId = mPi.createSession(

                    params, session.getInstallerPackageName(), session.getInstallerAttributionTag(),

                    0 /* UserHandle.SYSTEM */);

                    session.userId);

            final PackageInstallerSession apkParentSession = mPi.getSession(apkParentSessionId);

            try {

                apkParentSession.open();

tests/RollbackTest/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ java_test_host { 
    name: "MultiUserRollbackTest",

    srcs: ["MultiUserRollbackTest/src/**/*.java"],

    libs: ["tradefed"],

    static_libs: [

        "frameworks-base-hostutils",

    ],

    test_suites: ["general-tests"],

    test_config: "MultiUserRollbackTest.xml",

}

tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java

+37 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -40,6 +41,9 @@ public class MultiUserRollbackTest extends BaseHostJUnit4Test { 
    private static final long SWITCH_USER_COMPLETED_NUMBER_OF_POLLS = 60;

    private static final long SWITCH_USER_COMPLETED_POLL_INTERVAL_IN_MILLIS = 1000;



    @Rule

    public AbandonSessionsRule mHostTestRule = new AbandonSessionsRule(this);



    @After

    public void tearDown() throws Exception {

        removeSecondaryUserIfNecessary();
@@ -59,6 +63,37 @@ public class MultiUserRollbackTest extends BaseHostJUnit4Test { 
        runPhaseForUsers("testBasic", mSecondaryUserId);

    }



    /**

     * Tests staged install/rollback works correctly on the 2nd user.

     */

    @Test

    public void testStagedRollback() throws Exception {

        runPhaseForUsers("testStagedRollback_Phase1", mSecondaryUserId);

        getDevice().reboot();



        // Need to unlock the user for device tests to run successfully

        getDevice().startUser(mSecondaryUserId);

        awaitUserUnlocked(mSecondaryUserId);

        runPhaseForUsers("testStagedRollback_Phase2", mSecondaryUserId);

        getDevice().reboot();



        getDevice().startUser(mSecondaryUserId);

        awaitUserUnlocked(mSecondaryUserId);

        runPhaseForUsers("testStagedRollback_Phase3", mSecondaryUserId);

        getDevice().reboot();



        getDevice().startUser(mSecondaryUserId);

        awaitUserUnlocked(mSecondaryUserId);

        runPhaseForUsers("testStagedRollback_Phase4", mSecondaryUserId);

    }



    @Test

    public void testBadUpdateRollback() throws Exception {

        // Need to switch user in order to send broadcasts in device tests

        assertTrue(getDevice().switchUser(mSecondaryUserId));

        runPhaseForUsers("testBadUpdateRollback", mSecondaryUserId);

    }



    @Test

    public void testMultipleUsers() throws Exception {

        runPhaseForUsers("testMultipleUsersInstallV1", mOriginalUserId, mSecondaryUserId);
@@ -83,6 +118,8 @@ public class MultiUserRollbackTest extends BaseHostJUnit4Test { 


    private void removeSecondaryUserIfNecessary() throws Exception {

        if (mSecondaryUserId != -1) {

            // Can't remove the 2nd user without switching out of it

            assertTrue(getDevice().switchUser(mOriginalUserId));

            getDevice().removeUser(mSecondaryUserId);

            mSecondaryUserId = -1;

        }

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/MultiUserRollbackTest.java

+33 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ public class MultiUserRollbackTest { 
        new RollbackTest().testBasic();

    }



    @Test

    public void testBadUpdateRollback() throws Exception {

        new RollbackTest().testBadUpdateRollback();

    }



    /**

     * Install version 1 of the test app. This method is run for both users.

     */
@@ -115,4 +120,32 @@ public class MultiUserRollbackTest { 
        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);

        InstallUtils.processUserData(TestApp.A);

    }



    @Test

    public void testStagedRollback_Phase1() throws Exception {

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(-1);

        Install.single(TestApp.A1).setStaged().commit();

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(-1);

    }



    @Test

    public void testStagedRollback_Phase2() throws Exception {

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);

        Install.single(TestApp.A2).setStaged().setEnableRollback().commit();

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);

    }



    @Test

    public void testStagedRollback_Phase3() throws Exception {

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);

        RollbackInfo rollback = RollbackUtils.waitForAvailableRollback(TestApp.A);

        assertThat(rollback).packagesContainsExactly(Rollback.from(TestApp.A2).to(TestApp.A1));

        RollbackUtils.rollback(rollback.getRollbackId());

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);

    }



    @Test

    public void testStagedRollback_Phase4() {

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);

    }

}