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

Commit dc9c3d02 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Partially revert ag/17450859" into tm-dev

parents 0798416a 5b8bab91

tests/telephonytests/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ android_test { 
    name: "FrameworksTelephonyTests",

    name: "FrameworksTelephonyTests",

    // For access hidden connectivity methods in tests

    // For access hidden connectivity methods in tests

    defaults: ["framework-connectivity-test-defaults"],

    defaults: ["framework-connectivity-test-defaults"],

    certificate: "platform",

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

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





    libs: [

    libs: [

tests/telephonytests/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
     package="com.android.frameworks.telephonytests">

     package="com.android.frameworks.telephonytests">





    <application android:name="com.android.internal.telephony.TestApplication"

    <application android:name="com.android.internal.telephony.TestApplication"

        android:testOnly="true"

        android:largeHeap="true">

        android:largeHeap="true">

        <uses-library android:name="android.test.runner"/>

        <uses-library android:name="android.test.runner"/>

        <activity android:label="TelephonyTest"

        <activity android:label="TelephonyTest"

tests/telephonytests/AndroidTest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
<configuration description="Runs Frameworks Telephony Tests.">

<configuration description="Runs Frameworks Telephony Tests.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="test-file-name" value="FrameworksTelephonyTests.apk" />

        <option name="test-file-name" value="FrameworksTelephonyTests.apk" />

        <option name="install-arg" value="-t" />

    </target_preparer>

    </target_preparer>





    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct" />