diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-11-20 03:45:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-20 03:45:37 +0000 |
| commit | eca4c3a0d64f212cd7270944be80b0add125084d (patch) | |
| tree | 3f3a59062df9c18a8b9a3c4600094abc35f04ba6 /core/java | |
| parent | c128fa0f93a0950c0418e2dc83b2ca2b6cfbade2 (diff) | |
| parent | c359bbe0ecf4e25da8d3106bc2682a4427abe026 (diff) | |
Merge "Allow all system configs in /product"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/server/SystemConfig.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index c5be8e4a3aba..45069ca1d3e2 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -319,13 +319,11 @@ public class SystemConfig { readPermissions(Environment.buildPath( Environment.getOemDirectory(), "etc", "permissions"), oemPermissionFlag); - // Allow Product to customize system configs around libs, features, permissions and apps - int productPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES | ALLOW_PERMISSIONS | - ALLOW_APP_CONFIGS | ALLOW_PRIVAPP_PERMISSIONS; + // Allow Product to customize all system configs readPermissions(Environment.buildPath( - Environment.getProductDirectory(), "etc", "sysconfig"), productPermissionFlag); + Environment.getProductDirectory(), "etc", "sysconfig"), ALLOW_ALL); readPermissions(Environment.buildPath( - Environment.getProductDirectory(), "etc", "permissions"), productPermissionFlag); + Environment.getProductDirectory(), "etc", "permissions"), ALLOW_ALL); } void readPermissions(File libraryDir, int permissionFlag) { |