Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b8d5100 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge \\"Prevent PrintSpooler from being disabled\\" into nyc-mr1-dev am: 2d8c91f2 

am: 463c01b1

Change-Id: Ie8b7c05ece8c309da47acb988fce149ede972557
parents 0eabb4e2 463c01b1

packages/SettingsLib/src/com/android/settingslib/Utils.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ import android.graphics.drawable.Drawable; 
import android.net.ConnectivityManager;

import android.os.BatteryManager;

import android.os.UserManager;

import android.print.PrintManager;

import com.android.internal.util.UserIcons;

import com.android.settingslib.drawable.UserIconDrawable;
@@ -185,7 +186,8 @@ public class Utils { 
                        && sSystemSignature[0].equals(getFirstSignature(pkg)))

                || pkg.packageName.equals(sPermissionControllerPackageName)

                || pkg.packageName.equals(sServicesSystemSharedLibPackageName)

                || pkg.packageName.equals(sSharedSystemSharedLibPackageName);

                || pkg.packageName.equals(sSharedSystemSharedLibPackageName)

                || pkg.packageName.equals(PrintManager.PRINT_SPOOLER_PACKAGE_NAME);

    }



    private static Signature getFirstSignature(PackageInfo pkg) {