From 8f01151eae419471d4b27c955d38051594c6e988 Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Mon, 7 Jan 2019 09:08:55 +0000 Subject: [PATCH] Don't disable RollbackManagerService when selinux is enforcing. Now that selinux policy for rollback manager is in place. Test: device boots Test: atest RollbackTest Bug: 112431924 Change-Id: I6f8bb3bd98390575450649ce23d848ce1f91f0db --- .../server/rollback/RollbackManagerService.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/services/core/java/com/android/server/rollback/RollbackManagerService.java b/services/core/java/com/android/server/rollback/RollbackManagerService.java index 8c3f04f3b8a8c..4b5e76497f62c 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerService.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerService.java @@ -17,8 +17,6 @@ package com.android.server.rollback; import android.content.Context; -import android.os.SELinux; -import android.util.Log; import com.android.server.SystemService; @@ -30,8 +28,6 @@ import com.android.server.SystemService; */ public final class RollbackManagerService extends SystemService { - private static final String TAG = "RollbackManager"; - private RollbackManagerServiceImpl mService; public RollbackManagerService(Context context) { @@ -41,12 +37,6 @@ public final class RollbackManagerService extends SystemService { @Override public void onStart() { mService = new RollbackManagerServiceImpl(getContext()); - - // TODO: Set up sepolicy to allow publishing the service. - if (SELinux.isSELinuxEnforced()) { - Log.w(TAG, "RollbackManager disabled pending selinux policy updates"); - } else { - publishBinderService(Context.ROLLBACK_SERVICE, mService); - } + publishBinderService(Context.ROLLBACK_SERVICE, mService); } }