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

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

Merge changes I13f7cb16,Idf757414 

* changes:
  Multi-user profile perf-tests
  Reordering UserLifecycleTests in prep for more
parents 48f47c92 312da055

apct-tests/perftests/multiuser/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.perftests.multiuser">



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

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

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

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

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

apct-tests/perftests/multiuser/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

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

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

    </target_preparer>



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

apct-tests/perftests/multiuser/apps/Android.mk

0 → 100644
+20 −0
Original line number Diff line number Diff line 
# Copyright (C) 2019 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



# Build the test APKs using their own makefiles

include $(call all-makefiles-under,$(LOCAL_PATH))

apct-tests/perftests/multiuser/apps/dummyapp/Android.mk

0 → 100644
+26 −0
Original line number Diff line number Diff line 
# Copyright (C) 2019 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 19



LOCAL_PACKAGE_NAME := PerftestMultiuserDummyApp



LOCAL_SRC_FILES := $(call all-java-files-under, src)



include $(BUILD_PACKAGE)
 
 No newline at end of file

apct-tests/perftests/multiuser/apps/dummyapp/AndroidManifest.xml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

          package="perftests.multiuser.apps.dummyapp" >



    <application android:label="Perftest Multiuser Dummy App">



        <activity

            android:name=".DummyForegroundActivity"

            android:label="Perftest Multiuser Dummy App"

            android:exported="true"

            android:launchMode="singleTop" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>



    </application>



</manifest>
 
 No newline at end of file