diff options
author | Ytai Ben-Tsvi <ytai@google.com> | 2021-12-23 12:29:09 -0800 |
---|---|---|
committer | Ytai Ben-Tsvi <ytai@google.com> | 2021-12-23 12:41:02 -0800 |
commit | 21a296bf479bb300465b5be2fdba1968afd51a51 (patch) | |
tree | 2edb7f7939183f716bfeda0f04e3337c05e0fb4e /services/tests | |
parent | e11f54565e7c022734b9abc656fc2e6a6f16054c (diff) |
Run sound trigger HAL watchdog on uptime clock
Previously, it was implemented based on java.util.Timer, which uses a
wall clock. That is problematic, because that clock doesn't stop when
the system goes to sleep, and so if that happened in the middle of
executing soundtrigger HAL code, the watchdog would fire as soon as
the system woke up.
This change implements the watchdog using an uptime-clock-based timer.
Fixes: 199798343
Test: atest FrameworksServicesTests:com.android.server.soundtrigger_middleware.UptimeTimerTest
Merged-In: I913336837aff3e2c74c77f32aac24348612803f9
Change-Id: I5ce6ba997a7af616785634223af8c6139d030111
Diffstat (limited to 'services/tests')
-rw-r--r-- | services/tests/servicestests/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java b/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java new file mode 100644 index 000000000000..38297bf624b7 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/UptimeTimerTest.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.soundtrigger_middleware; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.concurrent.atomic.AtomicBoolean; + +@RunWith(AndroidJUnit4.class) +public class UptimeTimerTest { + private static final String TAG = "UptimeTimerTest"; + + @Test + public void testBasic() throws InterruptedException { + AtomicBoolean taskRan = new AtomicBoolean(false); + UptimeTimer timer = new UptimeTimer("TestTimer"); + timer.createTask(() -> taskRan.set(true), 100); + Thread.sleep(50); + boolean before = taskRan.get(); + Thread.sleep(100); + boolean after = taskRan.get(); + assertFalse(before); + assertTrue(after); + } + + @Test + public void testCancel() throws InterruptedException { + AtomicBoolean taskRan = new AtomicBoolean(false); + UptimeTimer timer = new UptimeTimer("TestTimer"); + UptimeTimer.Task task = timer.createTask(() -> taskRan.set(true), 100); + Thread.sleep(50); + boolean before = taskRan.get(); + task.cancel(); + Thread.sleep(100); + boolean after = taskRan.get(); + assertFalse(before); + assertFalse(after); + } +} |