Merge tag 'android-8.1.0_r1' into oreo-x86

Android 8.1.0 Release 1 (OPM1.171019.011)

diff --cc Android.mk
index af8ca98,d0b199d..4c1f2b3
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -73,9 -75,13 +79,14 @@@ common_static_libraries := 
        libbatteryservice \
        libavb \
  
+ # TODO: include "cert-err34-c" once we move to Binder
+ # TODO: include "cert-err58-cpp" once 36656327 is fixed
+ common_local_tidy_flags := -warnings-as-errors=clang-analyzer-security*,cert-*
+ common_local_tidy_checks := -*,clang-analyzer-security*,cert-*,-cert-err34-c,-cert-err58-cpp
+ 
  vold_conlyflags := -std=c11
  vold_cflags := -Werror -Wall -Wno-missing-field-initializers -Wno-unused-variable -Wno-unused-parameter
 +vold_cflags += $(if $(LINEAGE_BUILD),-DLINEAGE_BUILD)
  
  required_modules :=
  ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)

diff --cc Disk.cpp
Simple merge

diff --cc PrivateVolume.cpp
Simple merge

diff --cc PublicVolume.cpp
Simple merge

diff --cc Utils.cpp
index 47ce34e,b6c7bf8..55af78a
--- 1/Utils.cpp
--- 2/Utils.cpp
+++ b/Utils.cpp
@@@ -20,15 -21,11 +21,15 @@@
  
  #include <android-base/file.h>
  #include <android-base/logging.h>
+ #include <android-base/properties.h>
  #include <android-base/stringprintf.h>
 +#include "fs/Exfat.h"
 +#include "fs/Ntfs.h"
 +
  #include <cutils/fs.h>
- #include <cutils/properties.h>
 +#include <cutils/probe_module.h>
- #include <private/android_filesystem_config.h>
  #include <logwrap/logwrap.h>
+ #include <private/android_filesystem_config.h>
  
  #include <mutex>
  #include <dirent.h>

diff --cc VolumeManager.cpp
index d19cb86,13a943f..dabf8a5
mode 100755,100644..100755
--- 1/VolumeManager.cpp
--- 2/VolumeManager.cpp
+++ b/VolumeManager.cpp

diff --cc VolumeManager.h
Simple merge

diff --cc cryptfs.cpp
Simple merge

diff --cc fs/Ext4.cpp
index 25f2133,0cf4f9e..8bb59e3
--- 1/fs/Ext4.cpp
--- 2/fs/Ext4.cpp
+++ b/fs/Ext4.cpp
@@@ -36,8 -36,9 +36,9 @@@
  #include <linux/kdev_t.h>
  
  #define LOG_TAG "Vold"
 -
 +#include <private/android_filesystem_config.h>
  #include <android-base/logging.h>
+ #include <android-base/properties.h>
  #include <android-base/stringprintf.h>
  #include <cutils/log.h>
  #include <cutils/properties.h>

diff --cc main.cpp
index e8c46d7,30c839e..50ebdea
--- 1/main.cpp
--- 2/main.cpp
+++ b/main.cpp
@@@ -227,19 -225,20 +229,24 @@@ static int process_config(VolumeManage
  
      /* Loop through entries looking for ones that vold manages */
      *has_adoptable = false;
+     *has_quota = false;
      for (int i = 0; i < fstab->num_entries; i++) {
+         if (fs_mgr_is_quota(&fstab->recs[i])) {
+             *has_quota = true;
+         }
+ 
          if (fs_mgr_is_voldmanaged(&fstab->recs[i])) {
 -            if (fs_mgr_is_nonremovable(&fstab->recs[i])) {
 -                LOG(WARNING) << "nonremovable no longer supported; ignoring volume";
 -                continue;
 -            }
 -
              std::string sysPattern(fstab->recs[i].blk_device);
 +            std::string fstype;
 +            if (fstab->recs[i].fs_type) {
 +                fstype = fstab->recs[i].fs_type;
 +            }
 +            std::string mntopts;
 +            if (fstab->recs[i].fs_options) {
 +                mntopts = fstab->recs[i].fs_options;
 +            }
              std::string nickname(fstab->recs[i].label);
 +            int partnum = fstab->recs[i].partnum;
              int flags = 0;
  
              if (fs_mgr_is_encryptable(&fstab->recs[i])) {