diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-05-24 15:34:37 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-05-31 16:41:35 -0700 |
| commit | f20d640fa2b155a971ddfe0965fc803a73b5e53c (patch) | |
| tree | 0b5d315ca1fe3cd40716c24761e857b3f5d185a6 /services/java/com/android/server/SystemServer.java | |
| parent | 1d4306991bd6c820313719eb72ec169082b71540 (diff) | |
Restrictions Manager
Mechanism to register a provider for requesting an
administrator to respond to permission requests.
Request format and response format constants.
Description of manifest template for static restrictions.
Int type introduced in RestrictionEntry.
Needs more javadoc and better description of manifest templates,
including specifying the XML attributes.
Change-Id: I5a654d364e98379fc60f73db2e06bf9a8310263d
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index c0f60c74296f..27098e7ae08d 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -80,6 +80,7 @@ import com.android.server.pm.PackageManagerService; import com.android.server.pm.UserManagerService; import com.android.server.power.PowerManagerService; import com.android.server.power.ShutdownThread; +import com.android.server.restrictions.RestrictionsManagerService; import com.android.server.search.SearchManagerService; import com.android.server.statusbar.StatusBarManagerService; import com.android.server.storage.DeviceStorageMonitorService; @@ -941,6 +942,12 @@ public final class SystemServer { } try { + mSystemServiceManager.startService(RestrictionsManagerService.class); + } catch (Throwable e) { + reportWtf("starting RestrictionsManagerService", e); + } + + try { mSystemServiceManager.startService(MediaSessionService.class); } catch (Throwable e) { reportWtf("starting MediaSessionService", e); |