Rename data/staging to data/pkg_staging.
Test: Build and flash, atest apex_e2e_tests
Fixes: 122999313
Change-Id: I2cfa49d8467d67edc470b1cade3746426fa86e37
Merged-In: I2cfa49d8467d67edc470b1cade3746426fa86e37
diff --git a/private/apexd.te b/private/apexd.te
index ef20478..a35e4cc 100644
--- a/private/apexd.te
+++ b/private/apexd.te
@@ -41,7 +41,7 @@
# allow apexd to create symlinks in /apex
allow apexd apex_mnt_dir:lnk_file create_file_perms;
# allow apexd to unlink apex files in /data/apex/active
-# note that apexd won't be able to unlink files in /data/staging/session_XXXX,
+# note that apexd won't be able to unlink files in /data/pkg_staging/session_XXXX,
# because it doesn't have write permission for staging_data_file object.
allow apexd staging_data_file:file unlink;
@@ -50,7 +50,7 @@
allow apexd apk_tmp_file:file relabelfrom;
allow apexd apex_data_file:file relabelto;
-# allow apexd to read files from /data/staging and hardlink them to /data/apex.
+# allow apexd to read files from /data/pkg_staging and hardlink them to /data/apex.
allow apexd staging_data_file:dir r_dir_perms;
allow apexd staging_data_file:file { r_file_perms link };
diff --git a/private/file_contexts b/private/file_contexts
index 97352a5..1c038ad 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -453,7 +453,7 @@
/data/preloads/media(/.*)? u:object_r:preloads_media_file:s0
/data/preloads/demo(/.*)? u:object_r:preloads_media_file:s0
/data/server_configurable_flags(/.*)? u:object_r:server_configurable_flags_data_file:s0
-/data/staging(/.*)? u:object_r:staging_data_file:s0
+/data/pkg_staging(/.*)? u:object_r:staging_data_file:s0
# Misc data
/data/misc/adb(/.*)? u:object_r:adb_keys_file:s0
diff --git a/private/system_server.te b/private/system_server.te
index 4a48983..7e16f6a 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -481,7 +481,7 @@
allow system_server zoneinfo_data_file:dir create_dir_perms;
allow system_server zoneinfo_data_file:file create_file_perms;
-# Manage /data/staging.
+# Manage /data/pkg_staging.
allow system_server staging_data_file:dir create_dir_perms;
allow system_server staging_data_file:file create_file_perms;
diff --git a/public/file.te b/public/file.te
index 073be04..82438de 100644
--- a/public/file.te
+++ b/public/file.te
@@ -264,7 +264,7 @@
type dhcp_data_file, file_type, data_file_type, core_data_file_type;
# /data/server_configurable_flags
type server_configurable_flags_data_file, file_type, data_file_type, core_data_file_type;
-# /data/staging
+# /data/pkg_staging
type staging_data_file, file_type, data_file_type, core_data_file_type;
# Mount locations managed by vold