Merge "Fixing race condition on test information provider" into ub-launcher3-master
diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index 97424bb..1229a63 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -197,7 +197,8 @@
Wait.atMost(() -> "Switching nav mode: "
+ launcher.getNavigationModeMismatchError(),
- () -> launcher.getNavigationModeMismatchError() == null, WAIT_TIME_MS, launcher);
+ () -> launcher.getNavigationModeMismatchError() == null,
+ 60000 /* b/148422894 */, launcher);
return true;
}
diff --git a/src/com/android/launcher3/settings/NotificationDotsPreference.java b/src/com/android/launcher3/settings/NotificationDotsPreference.java
index f30470a..a91303a 100644
--- a/src/com/android/launcher3/settings/NotificationDotsPreference.java
+++ b/src/com/android/launcher3/settings/NotificationDotsPreference.java
@@ -20,7 +20,6 @@
import android.app.AlertDialog;
import android.app.Dialog;
-import android.app.DialogFragment;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
@@ -30,13 +29,14 @@
import android.util.AttributeSet;
import android.view.View;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.launcher3.R;
import com.android.launcher3.notification.NotificationListener;
import com.android.launcher3.util.SecureSettingsObserver;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* A {@link Preference} for indicating notification dots status.
* Also has utility methods for updating UI based on dots status changes.
diff --git a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
index 6445501..5880eb6 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
@@ -87,6 +87,11 @@
return 145935261;
}
+ if (matches("java\\.lang\\.AssertionError\\: http\\:\\/\\/go\\/tapl \\: want to get "
+ + "workspace object; Presence of recents button doesn't match the interaction "
+ + "mode, mode\\=ZERO_BUTTON, hasRecents\\=true", exception)) {
+ return 148422894;
+ }
final String logSinceBoot;
try {
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 534b0d4..5d75024 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -496,8 +496,8 @@
assertEquals("Unexpected display rotation",
mExpectedRotation, mDevice.getDisplayRotation());
- // b/149024111
- for (int i = 0; i != 100; ++i) {
+ // b/148422894
+ for (int i = 0; i != 600; ++i) {
if (getNavigationModeMismatchError() == null) break;
sleep(100);
}