diff options
| author | Vadim Tryshev <vadimt@google.com> | 2019-09-21 02:11:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-21 02:11:26 +0000 |
| commit | dcb5412e1c4092239cc1ef4df58484b7f67b29ad (patch) | |
| tree | 099d43f523b2d91c1e8347cff02b5b79fa8d076c /tests/src/com/android/launcher3 | |
| parent | f8a9a14acaaae9613b54b50f7fa4c81bcdaa97ff (diff) | |
| parent | 3bdba615428b384d5130cdaf775c315340c3afbd (diff) | |
| download | android_packages_apps_Trebuchet-dcb5412e1c4092239cc1ef4df58484b7f67b29ad.tar.gz android_packages_apps_Trebuchet-dcb5412e1c4092239cc1ef4df58484b7f67b29ad.tar.bz2 android_packages_apps_Trebuchet-dcb5412e1c4092239cc1ef4df58484b7f67b29ad.zip | |
Merge "Not using dropbox entries before the test start for diagnostics" into ub-launcher3-qt-qpr1-dev
Diffstat (limited to 'tests/src/com/android/launcher3')
| -rw-r--r-- | tests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java b/tests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java index 6a6916eec..42460961b 100644 --- a/tests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java +++ b/tests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java @@ -104,7 +104,8 @@ public class TestCommandReceiver extends ContentProvider { case GET_SYSTEM_HEALTH_MESSAGE: { final Bundle response = new Bundle(); - response.putString("result", TestHelpers.getSystemHealthMessage(getContext())); + response.putString("result", + TestHelpers.getSystemHealthMessage(getContext(), Long.parseLong(arg))); return response; } } diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 840fdd26c..1f4ba1af0 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -105,8 +105,9 @@ public abstract class AbstractLauncherUiTest { } if (TestHelpers.isInLauncherProcess()) { Utilities.enableRunningInTestHarnessForTests(); - mLauncher.setSystemHealthSupplier(() -> TestCommandReceiver.callCommand( - TestCommandReceiver.GET_SYSTEM_HEALTH_MESSAGE).getString("result")); + mLauncher.setSystemHealthSupplier(startTime -> TestCommandReceiver.callCommand( + TestCommandReceiver.GET_SYSTEM_HEALTH_MESSAGE, startTime.toString()). + getString("result")); mLauncher.setOnSettledStateAction( containerType -> executeOnLauncher( launcher -> |