diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2019-04-08 14:54:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-08 14:54:03 +0000 |
| commit | 9dfc48d06e0156c52df748ff64aa3bd2e09cd211 (patch) | |
| tree | 5c1c9d87dae920e065c7dfbe026df7075c8644dc /services/java/com/android/server/SystemServer.java | |
| parent | cb1536862860fb4fe58e3c19b4a230f32290e678 (diff) | |
| parent | d8eb8b2690dd27d5ffe6262dd8ce8594ec8028a6 (diff) | |
Merge "Restricted permission mechanism - framework" into qt-dev
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 106e64222c00..0cd730b68c72 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -32,6 +32,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; +import android.content.pm.PackageManagerInternal; import android.content.res.Configuration; import android.content.res.Resources.Theme; import android.database.sqlite.SQLiteCompatibilityWalFlags; @@ -124,6 +125,7 @@ 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.policy.PermissionPolicyService; import com.android.server.policy.PhoneWindowManager; import com.android.server.policy.role.LegacyRoleResolutionPolicy; import com.android.server.power.PowerManagerService; @@ -543,7 +545,7 @@ public final class SystemServer { } private boolean isFirstBootOrUpgrade() { - return mPackageManagerService.isFirstBoot() || mPackageManagerService.isUpgrade(); + return mPackageManagerService.isFirstBoot() || mPackageManagerService.isDeviceUpgrading(); } private void reportWtf(String msg, Throwable e) { @@ -1988,6 +1990,11 @@ public final class SystemServer { mSystemServiceManager.startBootPhase(SystemService.PHASE_DEVICE_SPECIFIC_SERVICES_READY); traceEnd(); + // Permission policy service + traceBeginAndSlog("StartPermissionPolicyService"); + mSystemServiceManager.startService(PermissionPolicyService.class); + traceEnd(); + // These are needed to propagate to the runnable below. final NetworkManagementService networkManagementF = networkManagement; final NetworkStatsService networkStatsF = networkStats; |