TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-16 12:49:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upstream system_properties

Browse Source
This commit is contained in:
topjohnwu
2020-01-27 19:50:03 +08:00
parent 30286f0ea5
commit e395c9442f
8 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/systemproperties/include/system_properties/context_node.h
View File

@@ -42,7 +42,7 @@ class ContextNode {
Unmap();
}
DISALLOW_COPY_AND_ASSIGN(ContextNode);
BIONIC_DISALLOW_COPY_AND_ASSIGN(ContextNode);
bool Open(bool access_rw, bool* fsetxattr_failed);
bool CheckAccessAndOpen();

10
native/jni/systemproperties/include/system_properties/prop_area.h
View File

@@ -86,7 +86,7 @@ struct prop_bt {
}
private:
DISALLOW_COPY_AND_ASSIGN(prop_bt);
BIONIC_DISALLOW_COPY_AND_ASSIGN(prop_bt);
};
class prop_area {
@@ -138,10 +138,10 @@ class prop_area {
prop_bt* root_node();
prop_bt* find_prop_bt(prop_bt* const bt, const char* name, uint32_t namelen, bool alloc_if_needed);
/* resetprop: Traverse through the trie and find the node */
prop_bt *find_prop_bt(prop_bt *const trie, const char *name, bool alloc_if_needed);
prop_bt *find_prop_bt(prop_bt *const bt, const char* name, bool alloc_if_needed);
prop_bt* find_prop_bt(prop_bt* const bt, const char* name, uint32_t namelen, bool alloc_if_needed);
const prop_info* find_property(prop_bt* const trie, const char* name, uint32_t namelen,
const char* value, uint32_t valuelen, bool alloc_if_needed);
@@ -163,5 +163,5 @@ class prop_area {
uint32_t reserved_[28];
char data_[0];
DISALLOW_COPY_AND_ASSIGN(prop_area);
BIONIC_DISALLOW_COPY_AND_ASSIGN(prop_area);
};

2
native/jni/systemproperties/include/system_properties/prop_info.h
View File

@@ -84,7 +84,7 @@ struct prop_info {
prop_info(const char* name, uint32_t namelen, uint32_t long_offset);
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(prop_info);
BIONIC_DISALLOW_IMPLICIT_CONSTRUCTORS(prop_info);
};
static_assert(sizeof(prop_info) == 96, "sizeof struct prop_info must be 96 bytes");

2
native/jni/systemproperties/include/system_properties/system_properties.h
View File

@@ -52,7 +52,7 @@ class SystemProperties {
explicit SystemProperties(bool initialized) : initialized_(initialized) {
}
DISALLOW_COPY_AND_ASSIGN(SystemProperties);
BIONIC_DISALLOW_COPY_AND_ASSIGN(SystemProperties);
bool Init(const char* filename);
bool AreaInit(const char* filename, bool* fsetxattr_failed);