diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-22 10:41:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-22 10:41:26 -0700 |
| commit | 17775724b89e942b06c67144317697924039ad99 (patch) | |
| tree | 4cfe5005fae8708b93ac9f8b64e92f2ee81f9d51 /init | |
| parent | 9c917a4c162d3581dc402827d837c477cfdbec2a (diff) | |
| parent | 5cb9a02b0322c18b48eb9ce261502c3b830c113c (diff) | |
| download | system_core-17775724b89e942b06c67144317697924039ad99.tar.gz system_core-17775724b89e942b06c67144317697924039ad99.tar.bz2 system_core-17775724b89e942b06c67144317697924039ad99.zip | |
am 5cb9a02b: am 7e723498: Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev
* commit '5cb9a02b0322c18b48eb9ce261502c3b830c113c':
Add permission for bluetooth app in non-primary users
Diffstat (limited to 'init')
| -rw-r--r-- | init/property_service.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/init/property_service.c b/init/property_service.c index c5903df71..33ec14633 100644 --- a/init/property_service.c +++ b/init/property_service.c @@ -27,6 +27,7 @@ #include <cutils/misc.h> #include <cutils/sockets.h> +#include <cutils/multiuser.h> #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ #include <sys/_system_properties.h> @@ -271,12 +272,19 @@ static int check_control_perms(const char *name, unsigned int uid, unsigned int static int check_perms(const char *name, unsigned int uid, unsigned int gid, char *sctx) { int i; + unsigned int app_id; + if(!strncmp(name, "ro.", 3)) name +=3; if (uid == 0) return check_mac_perms(name, sctx); + app_id = multiuser_get_app_id(uid); + if (app_id == AID_BLUETOOTH) { + uid = app_id; + } + for (i = 0; property_perms[i].prefix; i++) { if (strncmp(property_perms[i].prefix, name, strlen(property_perms[i].prefix)) == 0) { |