Merge "Prevent PrintSpooler from being disabled" into nyc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2d8c91f238
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user