drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 0b5598c9 to master

Browse Source 
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
This commit is contained in:
Brian Carlstrom
2014-05-07 15:21:14 -07:00
parent b5a449e488 0b5598c924
commit dfad99ad9f
4 changed files with 183 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/SystemServer.java
View File

@ -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 {