summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2019-08-13 11:45:45 -0700
committerMakoto Onuki <omakoto@google.com>2019-08-13 13:28:27 -0700
commit7d6d9ca359e8e85a21191dad51967abdfe19f539 (patch)
tree29a0a421689a79eb3457049fd8221553df70c470 /config
parent72295f7548d33ad8070d4375285b2843617cef69 (diff)
Don't refer to DeviceIdle from SystemServiceRegistry
In preparation of mainline. Test: atest cts/tests/tests/batterysaving/src/android/os/cts/deviceidle/DeviceIdleTest.java Bug: 137763703 Change-Id: Id3088ba65682722ff4c2808bdc86a0ade18a4ab5
Diffstat (limited to 'config')
-rw-r--r--config/preloaded-classes1
-rw-r--r--config/preloaded-classes-extra1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/preloaded-classes b/config/preloaded-classes
index ea50999e9d56..778a4d7bcda7 100644
--- a/config/preloaded-classes
+++ b/config/preloaded-classes
@@ -200,6 +200,7 @@ android.app.ContentProviderHolder
android.app.ContextImpl$1
android.app.ContextImpl$ApplicationContentResolver
android.app.ContextImpl
+android.app.DeviceIdleFrameworkInitializer
android.app.DexLoadReporter
android.app.Dialog$ListenersHandler
android.app.Dialog
diff --git a/config/preloaded-classes-extra b/config/preloaded-classes-extra
index 94849fb97433..4bfa873f63f2 100644
--- a/config/preloaded-classes-extra
+++ b/config/preloaded-classes-extra
@@ -1,5 +1,6 @@
# JobSchedulerFrameworkInitializer must always be preloaded because it registers the job scheduler
# service wrapper to SystemServiceRegistry.
+android.app.DeviceIdleFrameworkInitializer
android.app.job.JobSchedulerFrameworkInitializer
android.icu.impl.coll.CollationRoot
android.icu.impl.IDNA2003