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

Commit 44e2759d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change userdebug or eng condition check with debuggable" into udc-dev am: f64fa079 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22501265



Change-Id: Id64f891f472298fe806546e0405997a496ff1cb7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2cb5240d f64fa079

services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java

+2 −2
Original line number Diff line number Diff line
@@ -334,8 +334,8 @@ public class FontManagerShellCommand extends ShellCommand { 
    }



    private int installCert(ShellCommand shell) throws SystemFontException {

        if (!(Build.IS_USERDEBUG || Build.IS_ENG)) {

            throw new SecurityException("Only userdebug/eng device can add debug certificate");

        if (!Build.IS_DEBUGGABLE) {

            throw new SecurityException("Only debuggable device can add debug certificate");

        }

        if (Binder.getCallingUid() != Process.ROOT_UID) {

            throw new SecurityException("Only root can add debug certificate");