summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-31 17:09:50 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-31 17:09:50 +0000
commiteb94a818b474b571bed48c84d3e3b95d0edb5d97 (patch)
tree152f4e3909c7b5eadad23fc6cfbe2b854bfd4621
parent791c388bf305c67bb17be079c84b61c14cd490e7 (diff)
parent2b6f5b2e6522b15658a05506b6e32a4d6d2a7911 (diff)
Merge "Enable FgThread and ServiceThread on ravenwood" into main
-rw-r--r--core/java/com/android/server/FgThread.java1
-rw-r--r--core/java/com/android/server/ServiceThread.java1
-rw-r--r--ravenwood/texts/ravenwood-annotation-allowed-classes.txt3
3 files changed, 5 insertions, 0 deletions
diff --git a/core/java/com/android/server/FgThread.java b/core/java/com/android/server/FgThread.java
index f54ee5e70265..f8a6bb06798e 100644
--- a/core/java/com/android/server/FgThread.java
+++ b/core/java/com/android/server/FgThread.java
@@ -33,6 +33,7 @@ import java.util.concurrent.Executor;
*
* @hide
*/
+@android.ravenwood.annotation.RavenwoodKeepWholeClass
public final class FgThread extends ServiceThread {
private static final long SLOW_DISPATCH_THRESHOLD_MS = 100;
private static final long SLOW_DELIVERY_THRESHOLD_MS = 200;
diff --git a/core/java/com/android/server/ServiceThread.java b/core/java/com/android/server/ServiceThread.java
index 0eff1fca1e25..86e507b76771 100644
--- a/core/java/com/android/server/ServiceThread.java
+++ b/core/java/com/android/server/ServiceThread.java
@@ -27,6 +27,7 @@ import android.os.StrictMode;
*
* @hide
*/
+@android.ravenwood.annotation.RavenwoodKeepWholeClass
public class ServiceThread extends HandlerThread {
private static final String TAG = "ServiceThread";
diff --git a/ravenwood/texts/ravenwood-annotation-allowed-classes.txt b/ravenwood/texts/ravenwood-annotation-allowed-classes.txt
index a26fe66da2ab..70c1d781587f 100644
--- a/ravenwood/texts/ravenwood-annotation-allowed-classes.txt
+++ b/ravenwood/texts/ravenwood-annotation-allowed-classes.txt
@@ -2,6 +2,9 @@
com.android.internal.ravenwood.*
+com.android.server.FgThread
+com.android.server.ServiceThread
+
com.android.internal.display.BrightnessSynchronizer
com.android.internal.util.ArrayUtils
com.android.internal.logging.MetricsLogger