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

Commit 3998b7a5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"App launch - Test app changes\" into nyc-dev am: 8fabbb89" into nyc-mr1-dev

parents fd3dc6d9 8c5eb638

tests/AppLaunch/Android.mk

+3 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,8 @@ LOCAL_PACKAGE_NAME := AppLaunch 
LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_JAVA_LIBRARIES := android.test.runner





LOCAL_STATIC_JAVA_LIBRARIES := android-support-test



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





# Use the following include to make our test apk.

# Use the following include to make our test apk.

tests/AppLaunch/AndroidManifest.xml

+9 −1
Original line number Original line Diff line number Diff line
@@ -3,6 +3,14 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.tests.applaunch"

    package="com.android.tests.applaunch"

    android:sharedUserId="android.uid.system" >

    android:sharedUserId="android.uid.system" >



   <uses-permission android:name="android.permission.REAL_GET_TASKS" />

   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />



   <uses-sdk

        android:minSdkVersion="22"

        android:targetSdkVersion="24" />



    <instrumentation android:label="Measure app start up time"

    <instrumentation android:label="Measure app start up time"

                     android:name="android.test.InstrumentationTestRunner"

                     android:name="android.test.InstrumentationTestRunner"

                     android:targetPackage="com.android.tests.applaunch" />

                     android:targetPackage="com.android.tests.applaunch" />