Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Introducing ShortcutManager" into nyc-dev

Browse Source
This commit is contained in:
Makoto Onuki
2016-03-08 18:01:03 +00:00
committed by Android (Google) Code Review
parent 316b9ecdcf 6f7362d925
commit ed58f5f0aa
26 changed files with 4492 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,6 +83,7 @@ import com.android.server.pm.Installer;
import com.android.server.pm.LauncherAppsService;
import com.android.server.pm.OtaDexoptService;
import com.android.server.pm.PackageManagerService;
import com.android.server.pm.ShortcutService;
import com.android.server.pm.UserManagerService;
import com.android.server.power.PowerManagerService;
import com.android.server.power.ShutdownThread;
@@ -725,6 +726,9 @@ public final class SystemServer {
// Always start the Device Policy Manager, so that the API is compatible with
// API8.
mSystemServiceManager.startService(DevicePolicyManagerService.Lifecycle.class);
// TODO is this a good place?
mSystemServiceManager.startService(ShortcutService.Lifecycle.class);
}
if (!disableSystemUI) {