diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2016-01-15 11:29:14 -0800 |
|---|---|---|
| committer | Jeff Vander Stoep <jeffv@google.com> | 2016-01-15 11:29:14 -0800 |
| commit | 4f8bbf9eb47a2436781424faddb1290e3c327650 (patch) | |
| tree | 115f75839df68996ce5ea5073a21a49a00cc46dd /sepolicy/file_contexts | |
| parent | 5777f3023b582c2243335addb970528b7513cf5f (diff) | |
| parent | db43d37ebf1b01418fa6eb5510d183c2d11dfbbe (diff) | |
| download | bullhead-4f8bbf9eb47a2436781424faddb1290e3c327650.tar.gz | |
resolve merge conflicts of db43d37ebf to master.
Change-Id: I3325a950bcb8e268acae8740d15e6a5a4d791065
Diffstat (limited to 'sepolicy/file_contexts')
| -rw-r--r-- | sepolicy/file_contexts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index fee21f1..75dba5e 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -73,7 +73,7 @@ /dev/msm_audio_cal u:object_r:audio_device:s0 /dev/msm_rtac u:object_r:audio_device:s0 /dev/v4l-subdev[0-9]* u:object_r:video_device:s0 -/dev/media([0-9])+ u:object_r:camera_device:s0 +/dev/media([0-9])+ u:object_r:video_device:s0 /dev/ttyHS0 u:object_r:ttyHS0_device:s0 /dev/subsys_modem u:object_r:subsys_modem_device:s0 @@ -85,8 +85,8 @@ /dev/fpc1020 u:object_r:fingerprint_device:s0 # MSM camera related -/dev/media[0-9]+ u:object_r:camera_device:s0 -/dev/jpeg[0-9]+ u:object_r:camera_device:s0 +/dev/media[0-9]+ u:object_r:video_device:s0 +/dev/jpeg[0-9]+ u:object_r:video_device:s0 # System files /system/bin/perfd u:object_r:perfd_exec:s0 |