summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-08-23 15:38:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-23 15:38:42 +0000
commit903102c43014cccea9d0365a0700bd617faf2453 (patch)
tree9572fa68b10f6fd2eacea3d4734555f6d3b8f108 /config
parent635c8934dcf385af5d506c8f52839b523454a681 (diff)
parent7d6d9ca359e8e85a21191dad51967abdfe19f539 (diff)
Merge "Don't refer to DeviceIdle from SystemServiceRegistry"
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