Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AndroidSystemSEPolicy
- Activity
- Members

Snippets Groups Projects

6ba6705c

Commit 6ba6705c authored 7 years ago by Tomasz Wasilczyk

Downloads
- Plain Diff

resolve merge conflicts of c998f319 to stage-aosp-master

Test: after cherry-pick - it builds
Merged-In: I57c0150a52c13f1ce21f9ae2147e3814aad0fb7e
Change-Id: I7da8160a95e09946d283bd849628bd5392410353

parents 82fe6916 c998f319

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

private/hwservice_contexts 1 addition, 1 deletion

private/hwservice_contexts
private/system_server.te 1 addition, 0 deletions

private/system_server.te
public/attributes 6 additions, 0 deletions

public/attributes
public/hal_broadcastradio.te 4 additions, 0 deletions

public/hal_broadcastradio.te
public/hwservice.te 1 addition, 0 deletions

public/hwservice.te
vendor/file_contexts 1 addition, 0 deletions

vendor/file_contexts
vendor/hal_broadcastradio_default.te 5 additions, 0 deletions

vendor/hal_broadcastradio_default.te

with 19 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment