diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2023-12-01 17:18:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-01 17:18:00 +0000 |
| commit | 0ac2a76baadc64eb2b75c8ddd1480b5d4caf7969 (patch) | |
| tree | 69f2b9b853a2ca2d24c29a06553ed9d60d27f85a /ravenwood | |
| parent | 9562ea2a17125df83e9545169f722f5d0a23ca06 (diff) | |
| parent | 784b36cc341a37321c0d48815acfcb29b6c1d2a3 (diff) | |
| download | base-0ac2a76baadc64eb2b75c8ddd1480b5d4caf7969.tar.gz | |
Merge "Base support for `servicestests` under Ravenwood." into main
Diffstat (limited to 'ravenwood')
| -rw-r--r-- | ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuleImpl.java | 4 | ||||
| -rw-r--r-- | ravenwood/ravenwood-annotation-allowed-classes.txt | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuleImpl.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuleImpl.java index be0c09ee4a25..eacdc2f79254 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuleImpl.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuleImpl.java @@ -32,6 +32,8 @@ public class RavenwoodRuleImpl { android.os.Process.init$ravenwood(rule.mUid, rule.mPid); android.os.Binder.init$ravenwood(); + com.android.server.LocalServices.removeAllServicesForTest(); + if (rule.mProvideMainThread) { final HandlerThread main = new HandlerThread(MAIN_THREAD_NAME); main.start(); @@ -45,6 +47,8 @@ public class RavenwoodRuleImpl { Looper.clearMainLooperForTest(); } + com.android.server.LocalServices.removeAllServicesForTest(); + android.os.Process.reset$ravenwood(); android.os.Binder.reset$ravenwood(); } diff --git a/ravenwood/ravenwood-annotation-allowed-classes.txt b/ravenwood/ravenwood-annotation-allowed-classes.txt index eba6e0b90bb9..72e9ba367bc9 100644 --- a/ravenwood/ravenwood-annotation-allowed-classes.txt +++ b/ravenwood/ravenwood-annotation-allowed-classes.txt @@ -64,3 +64,5 @@ android.graphics.Point android.graphics.PointF android.graphics.Rect android.graphics.RectF + +com.android.server.LocalServices |