Fix Abvt Lockscreen and Abvt sim test failures
Test: make AndroidBvtTests -j40
Bug:33778132,33895882
Change-Id: Ia5140d5f2b5b0ec0f7528c910dfb8bd0544b82a9
(cherry picked from commit 60d4eace3870a371938f944ba1313b902deb949f)
diff --git a/libraries/system-helpers/connectivity-helper/src/android/system/helpers/ConnectivityHelper.java b/libraries/system-helpers/connectivity-helper/src/android/system/helpers/ConnectivityHelper.java
index e112221..3ad2647 100644
--- a/libraries/system-helpers/connectivity-helper/src/android/system/helpers/ConnectivityHelper.java
+++ b/libraries/system-helpers/connectivity-helper/src/android/system/helpers/ConnectivityHelper.java
@@ -78,7 +78,7 @@
* request, check for HTTP_OK
*/
public boolean isConnected() throws InterruptedException {
- int counter = 10;
+ int counter = 7;
long TIMEOUT_MS = TIMEOUT;
HttpURLConnection conn = null;
while (--counter > 0) {
diff --git a/libraries/system-helpers/sysui-helper/src/android/system/helpers/LockscreenHelper.java b/libraries/system-helpers/sysui-helper/src/android/system/helpers/LockscreenHelper.java
index 0cf1c66..7a1a5d4 100644
--- a/libraries/system-helpers/sysui-helper/src/android/system/helpers/LockscreenHelper.java
+++ b/libraries/system-helpers/sysui-helper/src/android/system/helpers/LockscreenHelper.java
@@ -33,6 +33,7 @@
import java.io.File;
import java.io.IOException;
import java.util.List;
+import android.util.Log;
import junit.framework.Assert;
/**
@@ -44,6 +45,7 @@
public static final int LONG_TIMEOUT = 2000;
public static final String EDIT_TEXT_CLASS_NAME = "android.widget.EditText";
public static final String CAMERA2_PACKAGE = "com.android.camera2";
+ public static final String CAMERA_PACKAGE = "com.google.android.GoogleCamera";
public static final String MODE_PIN = "PIN";
private static final int SWIPE_MARGIN = 5;
private static final int DEFAULT_FLING_STEPS = 5;
@@ -82,8 +84,9 @@
// Load camera on LockScreen and take a photo
mDevice.drag((w - 25), (h - 25), (int) (w * 0.5), (int) (w * 0.5), 40);
mDevice.waitForIdle();
+ Log.i(LOG_TAG, "Camer_package:" + CAMERA_PACKAGE);
return mDevice.wait(Until.hasObject(
- By.res(CAMERA2_PACKAGE, "activity_root_view")),
+ By.res(CAMERA_PACKAGE, "activity_root_view")),
LONG_TIMEOUT * 2);
}
