diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-07 15:21:14 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-07 15:24:01 -0700 |
| commit | dfad99ad9fd5953b9d726715c40197a3e70e7dd0 (patch) | |
| tree | 9eb7839fb997db3cfe3e649d5e5c0840dae4b35b /services/java/com/android/server | |
| parent | b5a449e4881de2af5f0a11fbb7a9a996937811d9 (diff) | |
| parent | 0b5598c924fc140db5cfee08c17fd91e630b1c9e (diff) | |
| download | frameworks_base-dfad99ad9fd5953b9d726715c40197a3e70e7dd0.zip frameworks_base-dfad99ad9fd5953b9d726715c40197a3e70e7dd0.tar.gz frameworks_base-dfad99ad9fd5953b9d726715c40197a3e70e7dd0.tar.bz2 | |
resolved conflicts for merge of 0b5598c9 to master
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 7c9f7a8..722b797 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -73,6 +73,7 @@ import com.android.server.net.NetworkPolicyManagerService; import com.android.server.net.NetworkStatsService; import com.android.server.notification.NotificationManagerService; import com.android.server.os.SchedulingPolicyService; +import com.android.server.pm.BackgroundDexOptService; import com.android.server.pm.Installer; import com.android.server.pm.LauncherAppsService; import com.android.server.pm.PackageManagerService; @@ -962,6 +963,13 @@ public final class SystemServer { } catch (Throwable e) { Slog.e(TAG, "Failure starting TrustManagerService", e); } + + try { + Slog.i(TAG, "BackgroundDexOptService"); + new BackgroundDexOptService(context); + } catch (Throwable e) { + reportWtf("starting BackgroundDexOptService", e); + } } try { |