commit 6c4ed5706567cce0f3f886f8d9663bf7bdb68cb7
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 29 04:07:32 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 29 04:07:32 2018 +0000
tree d85aa647b7131212ccf94034cf5884b30653eecb
parent fce960cdf491d0de6101d76292eacab2c45b29df
parent de2472d63e66f33c870adee704cf136a0221183c

Merge "Adding odm.img for `fastboot flashall`" into pi-dev

init/stable_properties.h

diff --git a/init/stable_properties.h b/init/stable_properties.h
index 4d47434..165d900 100644
--- a/init/stable_properties.h
+++ b/init/stable_properties.h
@@ -38,6 +38,7 @@
     "persist.sys.zram_enabled",
     "ro.bootmode",
     "ro.build.type",
+    "ro.debuggable",
     "sys.boot_completed",
     "sys.retaildemo.enabled",
     "sys.shutdown.requested",

libcutils/fs_config.cpp

diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 10050eb..f6f7128 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -186,16 +186,11 @@
     { 00755, AID_SYSTEM,    AID_GRAPHICS,  CAP_MASK_LONG(CAP_SYS_NICE),
                                               "system/bin/surfaceflinger" },
 
-    // Support hostapd administering a network interface (Old Path: <= O-MR1 release).
+    // Support hostapd administering a network interface.
     { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |
                                            CAP_MASK_LONG(CAP_NET_RAW),
                                               "vendor/bin/hostapd" },
 
-    // Support hostapd administering a network interface (New Path: >= P release).
-    { 00750, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |
-                                           CAP_MASK_LONG(CAP_NET_RAW),
-                                              "vendor/bin/hw/hostapd" },
-
     // Support Bluetooth legacy hal accessing /sys/class/rfkill
     // Support RT scheduling in Bluetooth
     { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) |