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

Commit 42fca77b 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... 

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

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



Change-Id: Ib0a68db858690ce0e8912749149cfd762530ec1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e9114c6 44e2759d

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");