summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2018-09-21 18:07:31 -0700
committer android-build-merger <android-build-merger@google.com> 2018-09-21 18:07:31 -0700
commit522ff2b27b5d66f6883504222034f11cf4fd62e7 (patch)
tree083a3f2a0b0a289899eac6aecc96487525992fb5
parentea098fac95b7697c365c9647272a564c654c49cf (diff)
parent34c4073744cbc8b1900117030498c9a41ec4f1fe (diff)
Merge "Frameworks: Remove AsyncTask from preloaded-classes" am: 0af2cf259b
am: 34c4073744 Change-Id: I1eee427d8e69e860cfcf1827a6604fdf7c726753
-rw-r--r--config/preloaded-classes1
-rw-r--r--config/preloaded-classes-blacklist1
2 files changed, 1 insertions, 1 deletions
diff --git a/config/preloaded-classes b/config/preloaded-classes
index 63c583f9264c..d93befdf5143 100644
--- a/config/preloaded-classes
+++ b/config/preloaded-classes
@@ -2381,7 +2381,6 @@ android.os.-$$Lambda$StrictMode$lu9ekkHJ2HMz0jd3F8K8MnhenxQ
android.os.-$$Lambda$StrictMode$yZJXPvy2veRNA-xL_SWdXzX_OLg
android.os.-$$Lambda$Trace$2zLZ-Lc2kAXsVjw_nLYeNhqmGq0
android.os.AsyncResult
-android.os.AsyncTask
android.os.AsyncTask$1
android.os.AsyncTask$2
android.os.AsyncTask$3
diff --git a/config/preloaded-classes-blacklist b/config/preloaded-classes-blacklist
index 8b8d640a543b..eca3bf3e47fe 100644
--- a/config/preloaded-classes-blacklist
+++ b/config/preloaded-classes-blacklist
@@ -1,4 +1,5 @@
android.net.ConnectivityThread$Singleton
+android.os.AsyncTask
android.os.FileObserver
android.widget.Magnifier
sun.nio.fs.UnixChannelFactory