diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-10 20:54:07 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-10 21:29:52 -0800 |
| commit | edaecc1db0584fa017822dfc2da0c968b53967e6 (patch) | |
| tree | dc2db79f490bc2e334c6e3688e099c98e846f381 /libs/hwui/Properties.h | |
| parent | baa73b056cbd4627a84b39a6267065ae56677220 (diff) | |
| download | frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.zip frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.tar.gz frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.tar.bz2 | |
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)
Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
Diffstat (limited to 'libs/hwui/Properties.h')
| -rw-r--r-- | libs/hwui/Properties.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h index befed16..7b9459a 100644 --- a/libs/hwui/Properties.h +++ b/libs/hwui/Properties.h @@ -253,7 +253,7 @@ enum DebugLevel { // Converts a number of kilo-bytes into bytes #define KB(s) s * 1024 -static DebugLevel readDebugLevel() { +static inline DebugLevel readDebugLevel() { char property[PROPERTY_VALUE_MAX]; if (property_get(PROPERTY_DEBUG, property, NULL) > 0) { return (DebugLevel) atoi(property); |