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

Commit d18a6d47 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "logd: use ro.debuggable instead of ro.build.type"

parents 250f5956 d1f41d60

logcat/logpersist

+2 −2
Original line number Original line Diff line number Diff line 
#! /system/bin/sh

#! /system/bin/sh

# logpersist cat start and stop handlers

# logpersist cat start and stop handlers

progname="${0##*/}"

progname="${0##*/}"

case `getprop ro.build.type` in

case `getprop ro.debuggable` in

userdebug|eng) ;;

1) ;;

*) echo "${progname} - Permission denied"

*) echo "${progname} - Permission denied"

   exit 1

   exit 1

   ;;

   ;;

logd/README.property

+3 −3
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ persist.logd.security bool false Enable security buffer. 
ro.device_owner            bool   false  Override persist.logd.security to false

ro.device_owner            bool   false  Override persist.logd.security to false

ro.logd.kernel             bool+ svelte+ Enable klogd daemon

ro.logd.kernel             bool+ svelte+ Enable klogd daemon

ro.logd.statistics         bool+ svelte+ Enable logcat -S statistics.

ro.logd.statistics         bool+ svelte+ Enable logcat -S statistics.

ro.build.type              string        if user, logd.statistics &

ro.debuggable              number        if not "1", logd.statistics &

                                         ro.logd.kernel default false.

                                         ro.logd.kernel default false.

persist.logd.logpersistd   string        Enable logpersist daemon, "logcatd"

persist.logd.logpersistd   string        Enable logpersist daemon, "logcatd"

                                         turns on logcat -f in logd context

                                         turns on logcat -f in logd context
@@ -46,10 +46,10 @@ persist.log.tag.<tag> string build default for log.tag.<tag> 




NB:

NB:

- bool+ - "true", "false" and comma separated list of "eng" (forced false if

- bool+ - "true", "false" and comma separated list of "eng" (forced false if

  ro.build.type is "user") or "svelte" (forced false if ro.config.low_ram is

  ro.debuggable is not "1") or "svelte" (forced false if ro.config.low_ram is

  true).

  true).

- svelte - see ro.config.low_ram for details.

- svelte - see ro.config.low_ram for details.

- svelte+ - see ro.config.low_ram and ro.build.type for details.

- svelte+ - see ro.config.low_ram and ro.debuggable for details.

- ro - <base property> temporary override, ro.<base property> platform default.

- ro - <base property> temporary override, ro.<base property> platform default.

- persist - <base property> override, persist.<base property> platform default.

- persist - <base property> override, persist.<base property> platform default.

- build - VERBOSE for native, DEBUG for jvm isLoggable, or developer option.

- build - VERBOSE for native, DEBUG for jvm isLoggable, or developer option.

logd/main.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -202,8 +202,8 @@ bool property_get_bool(const char *key, int flag) { 
        return false;

        return false;

    }

    }

    if (flag & BOOL_DEFAULT_FLAG_ENG) {

    if (flag & BOOL_DEFAULT_FLAG_ENG) {

        property_get("ro.build.type", property, "");

        property_get("ro.debuggable", property, "");

        if (!strcmp(property, "user")) {

        if (strcmp(property, "1")) {

            return false;

            return false;

        }

        }

    }

    }