commit b3e480feaa38964dd0f589ab661dffa4b8bd59d5
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 19 14:16:49 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 19 14:16:49 2021 +0000
tree 24ed6eb47b82de6a3a1bf814d6d870f631da26db
parent 9af3df5ba3487232c817fde838ef2c276924d081
parent 37667a3969fa0e9faaf7599a6733f0298c1a3f4c

Merge cherrypicks of [16081891] into sc-qpr1-d-release.

Change-Id: I235c4de381c5a317bb1153da9fcd30610beb2b06

tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java

diff --git a/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java b/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java
index 55fb3d0..1544652 100644
--- a/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SettingsPanelTest.java
@@ -50,6 +50,7 @@
     private static final int TIMEOUT = 8000;
 
     private static final String RESOURCE_DONE = "done";
+    private static final String RESOURCE_INTERNET_DIALOG_DONE = "done_layout";
     private static final String RESOURCE_SEE_MORE = "see_more";
     private static final String RESOURCE_TITLE = "panel_title";
     private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
@@ -142,7 +143,8 @@
 
         // Click the done button
         if (mHasTouchScreen) {
-            mDevice.findObject(By.res(SYSTEMUI_PACKAGE_NAME, RESOURCE_DONE)).click();
+            mDevice.findObject(
+                    By.res(SYSTEMUI_PACKAGE_NAME, RESOURCE_INTERNET_DIALOG_DONE)).click();
             mDevice.wait(Until.hasObject(By.pkg(mLauncherPackage).depth(0)), TIMEOUT);
         } else {
             mDevice.pressBack();