summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoshe <mosimchah@gmail.com>2019-06-22 02:56:16 +0200
committerGerrit Code Review <gerrit@box1>2019-06-22 02:56:16 +0200
commit1851359e0c3c5e9c322f53263a52f919c51cf6a6 (patch)
treeeeae6820c532cb8904e7f7df578356db85461662
parent44af7584c9b3ef2ec8a86fce2c8b35dcf164d303 (diff)
parent2e7ffa31903f3556727088334b60aa7da331f90c (diff)
Merge changes from topic "berkeley-pie" into p9.0HEADq10.0p9.0
* changes: kirin970: Remove unneeded sepolicy rule kirin970: Remove proximity check overlays
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml4
-rw-r--r--sepolicy/private/netd.te1
2 files changed, 2 insertions, 3 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 985ed57..faa292e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -217,10 +217,10 @@
<bool name="config_pinnerCameraApp">true</bool>
<!-- Default value for proximity check on screen wake
- NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)-->
+ NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)
<bool name="config_proximityCheckOnWake">true</bool>
<integer name="config_proximityCheckTimeout">200</integer>
- <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool>
+ <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool> -->
<!-- Hardware keys present on the device, stored as a bit field.
This integer should equal the sum of the corresponding value for each
diff --git a/sepolicy/private/netd.te b/sepolicy/private/netd.te
index 16ca979..d8cb113 100644
--- a/sepolicy/private/netd.te
+++ b/sepolicy/private/netd.te
@@ -4,5 +4,4 @@ allow netd proc_net:dir { write add_name };
allow netd self:capability fsetid;
allow netd proc_net:file create;
allow netd kernel:system module_request;
-allow netd self:capability sys_module;