remove unused scan_vendor_priv flag
This flag is no longer used.
BUG=b:120553209
TEST=build
Change-Id: I8bd6aed8859bf44c779fb75f439a1f17cbec90f7
Reviewed-on: https://chromium-review.googlesource.com/1714150
Tested-by: Chris Morin <cmtm@chromium.org>
Commit-Ready: Yusuke Sato <yusukes@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Yusuke Sato <yusukes@chromium.org>
diff --git a/arc/setup/arc_setup.cc b/arc/setup/arc_setup.cc
index c53889f..7ceb3bb 100644
--- a/arc/setup/arc_setup.cc
+++ b/arc/setup/arc_setup.cc
@@ -1914,7 +1914,6 @@
"-w", // set the working directory
"--", kCommand, "--serialno", serialnumber, "--disable-boot-completed",
config_.GetStringOrDie("DISABLE_BOOT_COMPLETED_BROADCAST"),
- "--vendor-privileged", config_.GetStringOrDie("ENABLE_VENDOR_PRIVILEGED"),
"--container-boot-type", std::to_string(static_cast<int>(boot_type)),
// When this COPY_PACKAGES_CACHE is set to "1", SystemServer copies
// /data/system/pacakges.xml to /data/system/pacakges_copy.xml after the
diff --git a/arc/setup/etc/arc-boot-continue.conf b/arc/setup/etc/arc-boot-continue.conf
index 7cb1c34..20cb3c4 100644
--- a/arc/setup/etc/arc-boot-continue.conf
+++ b/arc/setup/etc/arc-boot-continue.conf
@@ -17,7 +17,6 @@
import COPY_PACKAGES_CACHE
import DEMO_SESSION_APPS_PATH
import DISABLE_BOOT_COMPLETED_BROADCAST
-import ENABLE_VENDOR_PRIVILEGED
import IS_DEMO_SESSION
import LOCALE
import PREFERRED_LANGUAGES
diff --git a/login_manager/session_manager_impl.cc b/login_manager/session_manager_impl.cc
index d11092f..c667287 100644
--- a/login_manager/session_manager_impl.cc
+++ b/login_manager/session_manager_impl.cc
@@ -1616,8 +1616,6 @@
"CHROMEOS_USER=" + account_id,
base::StringPrintf("DISABLE_BOOT_COMPLETED_BROADCAST=%d",
request.skip_boot_completed_broadcast()),
- base::StringPrintf("ENABLE_VENDOR_PRIVILEGED=%d",
- request.scan_vendor_priv_app()),
base::StringPrintf("CONTAINER_PID=%d", pid),
"DEMO_SESSION_APPS_PATH=" + request.demo_session_apps_path(),
base::StringPrintf("IS_DEMO_SESSION=%d", request.is_demo_session()),
diff --git a/login_manager/session_manager_impl_test.cc b/login_manager/session_manager_impl_test.cc
index a342601..691f050 100644
--- a/login_manager/session_manager_impl_test.cc
+++ b/login_manager/session_manager_impl_test.cc
@@ -489,11 +489,6 @@
return *this;
}
- UpgradeContainerExpectationsBuilder& SetEnableVendorPrivileged(bool v) {
- enable_vendor_privileged_ = v;
- return *this;
- }
-
UpgradeContainerExpectationsBuilder& SetIsDemoSession(bool v) {
is_demo_session_ = v;
return *this;
@@ -537,8 +532,6 @@
"CHROMEOS_INSIDE_VM=0", std::string("CHROMEOS_USER=") + kSaneEmail,
"DISABLE_BOOT_COMPLETED_BROADCAST=" +
std::to_string(disable_boot_completed_callback_),
- "ENABLE_VENDOR_PRIVILEGED=" +
- std::to_string(enable_vendor_privileged_),
// The upgrade signal has a PID.
"CONTAINER_PID=" + std::to_string(kAndroidPid),
"DEMO_SESSION_APPS_PATH=" + demo_session_apps_path_,
@@ -552,7 +545,6 @@
private:
bool dev_mode_ = false;
bool disable_boot_completed_callback_ = false;
- bool enable_vendor_privileged_ = false;
bool is_demo_session_ = false;
std::string demo_session_apps_path_;
bool skip_packages_cache_ = false;
@@ -2157,7 +2149,6 @@
*init_controller_,
TriggerImpulseInternal(SessionManagerImpl::kContinueArcBootImpulse,
UpgradeContainerExpectationsBuilder()
- .SetEnableVendorPrivileged(true)
.Build(),
InitDaemonController::TriggerMode::SYNC))
.WillOnce(WithoutArgs(Invoke(CreateEmptyResponse)));
@@ -2168,7 +2159,6 @@
.WillOnce(WithoutArgs(Invoke(CreateEmptyResponse)));
auto upgrade_request = CreateUpgradeArcContainerRequest();
- upgrade_request.set_scan_vendor_priv_app(true);
EXPECT_TRUE(
impl_->UpgradeArcContainer(&error, SerializeAsBlob(upgrade_request)));
EXPECT_FALSE(error.get());
diff --git a/system_api/dbus/login_manager/arc.proto b/system_api/dbus/login_manager/arc.proto
index 66550f8..bcce932 100644
--- a/system_api/dbus/login_manager/arc.proto
+++ b/system_api/dbus/login_manager/arc.proto
@@ -71,10 +71,6 @@
// Option to disable ACTION_BOOT_COMPLETED broadcast for 3rd party apps.
optional bool skip_boot_completed_broadcast = 2 [default = false];
- // Option to enable package manager service to scan /vendor/priv-app
- // directory.
- optional bool scan_vendor_priv_app = 3 [default = false];
-
// Optional mode for packages cache tests.
optional PackageCacheMode packages_cache_mode = 4 [default = DEFAULT];
