d3eb645ce7290c591446ef9579573a63a670bc38 - platform/frameworks/base

commit	d3eb645ce7290c591446ef9579573a63a670bc38	[log] [tgz]
author	Tadashi G. Takaoka <takaoka@google.com>	Sat Nov 03 18:21:40 2018 -0700
committer	Tadashi G. Takaoka <takaoka@google.com>	Sat Nov 03 19:13:28 2018 -0700
tree	cc0257fcd3b8bde7dc759042ecf1059165a9dd66
parent	97dfb6aeebcd538d43d5717c2a823e019b0d6c9f [diff]

Move some AM tests back to FrameworksServicesTests

The following com.android.server.am tests has been moved to WmTests by
Idc2dc9e80d, but those should be moved back to FrameworksServicesTests.
 - ActivityManagerServiceTest
 - ActivityManagerTest
 - ActivityManagerInternalTest
 - AppErrorDialogTest
 - BroadcastRecordTest
 - CoreSettingsObserverTest
 - GlobalSettingsToPropertiesMapperTest
 - MemoryStatUtilTest
 - UserControllerTest

Bug: 113800711
Test: Pass all AM presubmit tests in FrameworksServicesTests
  $ tradefed.sh run commandAndExit FrameworksServicesTests \
      --include-filter com.android.server.am. \
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest

Change-Id: I8852d1a26d7e9d9e52a06fb8ed90d15b6f40bf1c

services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/ActivityManagerInternalTest.java - diff]
services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/ActivityManagerServiceTest.java - diff]
services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/ActivityManagerTest.java - diff]
services/tests/servicestests/src/com/android/server/am/AppErrorDialogTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/AppErrorDialogTest.java - diff]
services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/BroadcastRecordTest.java - diff]
services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/CoreSettingsObserverTest.java - diff]
services/tests/servicestests/src/com/android/server/am/GlobalSettingsToPropertiesMapperTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/GlobalSettingsToPropertiesMapperTest.java - diff]
services/tests/servicestests/src/com/android/server/am/MemoryStatUtilTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/MemoryStatUtilTest.java - diff]
services/tests/servicestests/src/com/android/server/am/UserControllerTest.java[Renamed from services/tests/wmtests/src/com/android/server/am/UserControllerTest.java - diff]

9 files changed

tree: cc0257fcd3b8bde7dc759042ecf1059165a9dd66