diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2016-05-13 14:09:27 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2016-05-19 17:25:41 -0700 |
| commit | c845b2a21cedda4dd221fcf01aae74706ecade94 (patch) | |
| tree | 778f40db36bbbae6ccfd64a6f531c4fe75e1093e /core/java/android/app/ActivityThread.java | |
| parent | 212fe6c0714bb79d70d3ea424eea8211ee1421f5 (diff) | |
Use an attribute for the network security config resource
Originally we went with the meta-data approach to make unbundling
easier, however with the amount of platform changes that the config
ended up relying on it would be better to focus on exposing it through
the platform.
Bug:28763009
Change-Id: Iaf80001b1980220cd2e1e05faf2dc86af41700e1
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index a30a60673aa3..dff07693c82f 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -5221,7 +5221,7 @@ public final class ActivityThread { // code is loaded to prevent issues with instances of TLS objects being created before // the provider is installed. Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "NetworkSecurityConfigProvider.install"); - NetworkSecurityConfigProvider.install(appContext); + NetworkSecurityConfigProvider.install(appContext, data.appInfo); Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); // Continue loading instrumentation. |