commit aee40511ae3082c12ff1ef413dde12b7aba21d4f
author Martijn Coenen <maco@google.com> Tue Feb 18 16:29:25 2020 +0100
committer Martijn Coenen <maco@google.com> Thu Feb 20 00:39:05 2020 +0100
tree 85ec3aa0415d76e6fddcf38645f19e1ac8effb69
parent 816f4d94f6223cbc00f9d03e95336740dc47a6a5

Switch to new project ID constants.

Use new constants, instead of reusing previous sdcardfs values.

Bug: 146419093
Test: lsattr -pR
Change-Id: I7409d86cac5360e125e843cc79f3c5f41d74dd1e

FsCrypt.cpp

diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index 141f4c9..8682bdc 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -40,6 +40,7 @@
 #include <unistd.h>
 
 #include <private/android_filesystem_config.h>
+#include <private/android_projectid_config.h>
 
 #include "android/os/IVold.h"
 
@@ -804,7 +805,8 @@
         // Setup quota project ID and inheritance policy
         if (!IsFilesystemSupported("sdcardfs")) {
             if (SetQuotaInherit(media_ce_path) != 0) return false;
-            if (SetQuotaProjectId(media_ce_path, multiuser_get_uid(user_id, AID_MEDIA_RW)) != 0) {
+            if (SetQuotaProjectId(media_ce_path,
+                                  multiuser_get_uid(user_id, PROJECT_ID_EXT_DEFAULT)) != 0) {
                 return false;
             }
         }