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

Commit 9a9b5c41 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "[pm] fix PackageManagerServiceTest" into udc-dev am: 7b288aa8 

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



Change-Id: I0f51fe0c2cd69060a7440bb852c3d08c102b1f32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 817b74a9 7b288aa8

services/tests/PackageManagerServiceTests/server/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ android_test { 
        ":PackageParserTestApp6",

    ],

    resource_zips: [":PackageManagerServiceServerTests_apks_as_resources"],



    data: [

        ":StubTestApp",

    ],

}



// Rules to copy all the test apks to the intermediate raw resource directory

services/tests/PackageManagerServiceTests/server/AndroidTest.xml

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
        <option name="run-command" value="settings put global verifier_engprod 1" />

    </target_preparer>



    <!-- Load additional APKs onto device -->

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

        <option name="push" value="StubTestApp.apk->/data/local/tmp/servicestests/StubTestApp.apk"/>

    </target_preparer>



    <option name="test-tag" value="PackageManagerServiceServerTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.server.pm.test.service.server" />

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerServiceTest.java

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.app.AppGlobals; 
import android.content.IIntentReceiver;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;
@@ -70,7 +69,7 @@ import java.util.regex.Pattern; 
@RunWith(AndroidJUnit4.class)

public class PackageManagerServiceTest {



    private static final String PACKAGE_NAME = "com.android.frameworks.servicestests";

    private static final String PACKAGE_NAME = "com.android.server.pm.test.service.server";



    private static final String TEST_DATA_PATH = "/data/local/tmp/servicestests/";

    private static final String TEST_APP_APK = "StubTestApp.apk";

services/tests/servicestests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ android_test { 
        ":SimpleServiceTestApp1",

        ":SimpleServiceTestApp2",

        ":SimpleServiceTestApp3",

        ":StubTestApp",

        ":SuspendTestApp",

        ":MediaButtonReceiverHolderTestHelperApp",

        "data/broken_shortcut.xml",

services/tests/servicestests/AndroidTest.xml

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ 
        <option name="teardown-command" value="rm -rf /data/local/tmp/servicestests"/>

    </target_preparer>



    <!-- Load additional APKs onto device -->

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

        <option name="push" value="StubTestApp.apk->/data/local/tmp/servicestests/StubTestApp.apk"/>

    </target_preparer>



    <option name="test-tag" value="FrameworksServicesTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.frameworks.servicestests" />