diff options
| author | Elliott Hughes <enh@google.com> | 2017-04-17 14:53:07 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-04-17 17:16:44 -0700 |
| commit | a0e5d06c80c4c7cd8ae96e75d6b17c696a97a21d (patch) | |
| tree | b6cd8b2f31d5ac094d82eee0038a2f154855deba /libc/include/sys/system_properties.h | |
| parent | 083faf34c2aac44836baf5e9be703410c36eb07d (diff) | |
| download | android_bionic-a0e5d06c80c4c7cd8ae96e75d6b17c696a97a21d.tar.gz android_bionic-a0e5d06c80c4c7cd8ae96e75d6b17c696a97a21d.tar.bz2 android_bionic-a0e5d06c80c4c7cd8ae96e75d6b17c696a97a21d.zip | |
Un-deprecated __system_property_find_nth.
Netflix was using this, and looking the header file, although
__system_property_find_nth has been available since the beginning of time,
__system_property_foreach only appeared in 16. So anyone who wants to run
on pre-JellyBean devices would want to use __system_property_find_nth.
It's pretty much a one-liner in terms of __system_property_foreach anyway,
so it doesn't cost us anything to keep it.
Also restore slightly better tests than we originally removed.
Bug: http://b/36566667
Test: ran tests
(cherry picked from commit 438e01940b90a2b6061a9b9809e08466e1e9faac)
Change-Id: I639f2142ad4ba049b990b13ccccd255be4b4f479
Diffstat (limited to 'libc/include/sys/system_properties.h')
| -rw-r--r-- | libc/include/sys/system_properties.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/include/sys/system_properties.h b/libc/include/sys/system_properties.h index b55566e69..c0bd44516 100644 --- a/libc/include/sys/system_properties.h +++ b/libc/include/sys/system_properties.h @@ -91,11 +91,11 @@ bool __system_property_wait(const prop_info* pi, /* Deprecated. In Android O and above, there's no limit on property name length. */ #define PROP_NAME_MAX 32 /* Deprecated. Use __system_property_read_callback instead. */ -int __system_property_read(const prop_info *pi, char *name, char *value); +int __system_property_read(const prop_info* pi, char* name, char* value); /* Deprecated. Use __system_property_read_callback instead. */ -int __system_property_get(const char *name, char *value); -/* Deprecated. Use __system_property_foreach instead. Aborts in Android O and above. */ -const prop_info *__system_property_find_nth(unsigned n) __REMOVED_IN(26); +int __system_property_get(const char* name, char* value); +/* Deprecated. Use __system_property_foreach instead. */ +const prop_info* __system_property_find_nth(unsigned n); __END_DECLS |