Disable user activity logging if we're under MASH.

Bug: 821036
Change-Id: I98e392f3dd60e4148fd04a164e3a9fe5580fe57f
Reviewed-on: https://chromium-review.googlesource.com/961165
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Jia Meng <jiameng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542969}

chrome/browser/chromeos/power/ml/user_activity_controller.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/power/ml/user_activity_controller.h"
 
+#include "chrome/browser/chromeos/ash_config.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/system/devicetype.h"
@@ -18,7 +19,10 @@ namespace power {
 namespace ml {
 
 UserActivityController::UserActivityController() {
-  if (chromeos::GetDeviceType() != chromeos::DeviceType::kChromebook)
+  // TODO(jiameng): video detector below doesn't work with MASH. Temporary
+  // solution is to disable logging if we're under MASH env.
+  if (chromeos::GetDeviceType() != chromeos::DeviceType::kChromebook ||
+      chromeos::GetAshConfig() == ash::Config::MASH)
     return;
 
   chromeos::PowerManagerClient* power_manager_client =