commit f4870cd1293b41b898aa3a86d52ccb38ad32c2ac
author Mitsuru Oshima <oshima@chromium.org> Wed Sep 12 13:18:05 2018 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sun Sep 23 23:40:14 2018 +0000
tree 81277d564945cdc7e5a7d4140bbf36daed03cf11
parent 438d026e559f573488f30281066da3cbe669ac93

arc-setup: Remove ARC_LCD_DENSITY/ARC_UI_DENSITY from config.json

Use the ARC_LCD_DENSITy passed from login_manager instead

CQ-DEPEND=CL:1238785
BUG=b:66995734
BUG=b:113888789
TEST=manually tested on caroline with custom scale factor 1, 1.25, 1.6, 2, 2,25.
and make sure they get 160, 160, 213, 240, 280 dpi respectively

Reviewed-on: https://chromium-review.googlesource.com/1222568
Commit-Ready: Mitsuru Oshima (OOO 17-21) <oshima@chromium.org>
Tested-by: Mitsuru Oshima (OOO 17-21) <oshima@chromium.org>
Reviewed-by: Yusuke Sato <yusukes@chromium.org>

Change-Id: Ibc0498d6de7a22ccaa18bc6d71b4d831a9ad2966
(cherry picked from commit 5b8a0ab4fd368afaf075eeb19ffabcba797987e9)
Reviewed-on: https://chromium-review.googlesource.com/1239242
Tested-by: Yusuke Sato <yusukes@chromium.org>
Trybot-Ready: Yusuke Sato <yusukes@chromium.org>
Reviewed-by: Ricardo Quesada <ricardoq@chromium.org>
Commit-Queue: Yusuke Sato <yusukes@chromium.org>

arc/setup/arc_setup.cc

diff --git a/arc/setup/arc_setup.cc b/arc/setup/arc_setup.cc
index 9f92d97..ee19b7e 100644
--- a/arc/setup/arc_setup.cc
+++ b/arc/setup/arc_setup.cc
@@ -1102,9 +1102,6 @@
   const std::string arc_lcd_density =
       GetEnvOrDie(arc_paths_->env.get(), "ARC_LCD_DENSITY");
   LOG(INFO) << "lcd_density is " << arc_lcd_density;
-  const std::string arc_ui_scale =
-      GetEnvOrDie(arc_paths_->env.get(), "ARC_UI_SCALE");
-  LOG(INFO) << "ui_scale is " << arc_ui_scale;
 
   const std::string arc_container_ipv4_address =
       GetEnvOrDie(arc_paths_->env.get(), "ARC_CONTAINER_IPV4_ADDRESS");
@@ -1152,14 +1149,13 @@
       "androidboot.vm=%d "
       "androidboot.debuggable=%d "
       "androidboot.lcd_density=%s "
-      "androidboot.ui_scale=%s "
       "androidboot.container_ipv4_address=%s "
       "androidboot.gateway_ipv4_address=%s "
       "androidboot.native_bridge=%s "
       "androidboot.chromeos_channel=%s "
       "androidboot.boottime_offset=%" PRId64 "\n" /* in nanoseconds */,
       is_dev_mode, !is_dev_mode, is_inside_vm, is_debuggable,
-      arc_lcd_density.c_str(), arc_ui_scale.c_str(),
+      arc_lcd_density.c_str(),
       arc_container_ipv4_address.c_str(), arc_gateway_ipv4_address.c_str(),
       native_bridge.c_str(), chromeos_channel.c_str(),
       ts.tv_sec * base::Time::kNanosecondsPerSecond + ts.tv_nsec);

arc/setup/etc/arc-setup-env

diff --git a/arc/setup/etc/arc-setup-env b/arc/setup/etc/arc-setup-env
index cfff7a4..c2bddf3 100644
--- a/arc/setup/etc/arc-setup-env
+++ b/arc/setup/etc/arc-setup-env
@@ -34,8 +34,6 @@
 # ------------------------------------------------------------------------------
 # ALL variables below are regexp-matched by ebuild.
 # Be careful when editing. Variables are lexicographically sorted.
-export ARC_LCD_DENSITY=-1
-export ARC_UI_SCALE=-1
 
 # Setting this value to 1 will delete /data/dalvik-cache before ARC container
 # starts.