PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flaky test for persistent notifications" into main am: b6fc7a6f58 am: fdd68f473b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3156445

Change-Id: I0635a73774b0db08c401ef2523b2da13b0b359f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pawan Wagh
2024-07-03 15:47:26 +00:00
committed by Automerger Merge Worker
parent 900412914f fdd68f473b
commit e1a69960f9
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/PageAgnosticNotificationService.java
View File

@@ -134,6 +134,6 @@ public class PageAgnosticNotificationService extends Service {
// No updates should be allowed in page-agnostic mode // No updates should be allowed in page-agnostic mode
disableAutomaticUpdates(); disableAutomaticUpdates();
return Service.START_NOT_STICKY; return Service.START_REDELIVER_INTENT;
} }
} }

2
tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java
View File

@@ -76,11 +76,13 @@ public class Enable16KbTest extends BaseHostJUnit4Test {
installTestApp(); installTestApp();
// Enable developer option and switch to 16kb kernel and Check page size // Enable developer option and switch to 16kb kernel and Check page size
getDevice().enableAdbRoot();
runTestAndWait(SWITCH_TO_16KB); runTestAndWait(SWITCH_TO_16KB);
result = getDevice().executeShellCommand("getconf PAGE_SIZE"); result = getDevice().executeShellCommand("getconf PAGE_SIZE");
assertEquals("16384", result.strip()); assertEquals("16384", result.strip());
// switch back to 4kb kernel and check page size // switch back to 4kb kernel and check page size
getDevice().enableAdbRoot();
runTestAndWait(SWITCH_TO_4KB); runTestAndWait(SWITCH_TO_4KB);
result = getDevice().executeShellCommand("getconf PAGE_SIZE"); result = getDevice().executeShellCommand("getconf PAGE_SIZE");
assertEquals("4096", result.strip()); assertEquals("4096", result.strip());

3
tests/Enable16KbTests/test_16kb_app/src/com/android/settings/development/test/Enable16KbDeviceTest.java
View File

@@ -68,6 +68,8 @@ public class Enable16KbDeviceTest {
throw new RuntimeException("failed to freeze device orientation", e); throw new RuntimeException("failed to freeze device orientation", e);
} }
mDevice.executeShellCommand("am start -a com.android.setupwizard.FOUR_CORNER_EXIT");
mDevice.waitForWindowUpdate(null, TIMEOUT);
mDevice.executeShellCommand("input keyevent KEYCODE_WAKEUP"); mDevice.executeShellCommand("input keyevent KEYCODE_WAKEUP");
mDevice.executeShellCommand("wm dismiss-keyguard"); mDevice.executeShellCommand("wm dismiss-keyguard");
} }
@@ -150,6 +152,7 @@ public class Enable16KbDeviceTest {
private void openPersistentNotification(String title) { private void openPersistentNotification(String title) {
mDevice.openNotification(); mDevice.openNotification();
mDevice.waitForWindowUpdate(null, TIMEOUT);
verifyTextOnScreen(title); verifyTextOnScreen(title);
mDevice.wait(Until.findObject(By.text(title)), TIMEOUT).click(); mDevice.wait(Until.findObject(By.text(title)), TIMEOUT).click();
mDevice.waitForWindowUpdate(null, TIMEOUT); mDevice.waitForWindowUpdate(null, TIMEOUT);