Sends hidden ARC++ applications in ChildStatusReport.

Send ARC++ applications that should be hidden from
the family link app through ChildStatusReport.
Example of these apps are the new ARC++ TWAs
installed through playstore. The user is not able
to launch these applications from the launcher and
hence they shouldn't be added to AppActivityRegistry.

Bug: 1093072
Change-Id: I0b6bd2016cf5c00bf5096d90d88c0ebbf500cecb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2252919Reviewed-by: Jeevan Shikaram <jshikaram@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Commit-Queue: Yilkal Abe <yilkal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782025}

chrome/browser/chromeos/child_accounts/child_user_service.cc

@@ -96,6 +96,7 @@ app_time::AppActivityReportInterface::ReportParams
 ChildUserService::GenerateAppActivityReport(
     enterprise_management::ChildStatusReportRequest* report) {
   DCHECK(app_time_controller_);
+  app_time_controller_->app_registry()->GenerateHiddenApps(report);
   return app_time_controller_->app_registry()->GenerateAppActivityReport(
       report);
 }

chrome/browser/chromeos/child_accounts/time_limits/app_activity_registry.cc

@@ -34,26 +34,6 @@ constexpr base::TimeDelta kFiveMinutes = base::TimeDelta::FromMinutes(5);
 constexpr base::TimeDelta kOneMinute = base::TimeDelta::FromMinutes(1);
 constexpr base::TimeDelta kZeroMinutes = base::TimeDelta::FromMinutes(0);
 
-enterprise_management::App::AppType AppTypeForReporting(
-    apps::mojom::AppType type) {
-  switch (type) {
-    case apps::mojom::AppType::kArc:
-      return enterprise_management::App::ARC;
-    case apps::mojom::AppType::kBuiltIn:
-      return enterprise_management::App::BUILT_IN;
-    case apps::mojom::AppType::kCrostini:
-      return enterprise_management::App::CROSTINI;
-    case apps::mojom::AppType::kExtension:
-      return enterprise_management::App::EXTENSION;
-    case apps::mojom::AppType::kPluginVm:
-      return enterprise_management::App::PLUGIN_VM;
-    case apps::mojom::AppType::kWeb:
-      return enterprise_management::App::WEB;
-    default:
-      return enterprise_management::App::UNKNOWN;
-  }
-}
-
 enterprise_management::AppActivity::AppState AppStateForReporting(
     AppState state) {
   switch (state) {
@@ -395,6 +375,21 @@ void AppActivityRegistry::SetReportingEnabled(base::Optional<bool> value) {
     activity_reporting_enabled_ = value.value();
 }
 
+void AppActivityRegistry::GenerateHiddenApps(
+    enterprise_management::ChildStatusReportRequest* report) {
+  const std::vector<AppId> hidden_arc_apps =
+      app_service_wrapper_->GetHiddenArcApps();
+  for (const auto& app_id : hidden_arc_apps) {
+    enterprise_management::App* app_info = report->add_hidden_app();
+    app_info->set_app_id(app_id.app_id());
+    app_info->set_app_type(AppTypeForReporting(app_id.app_type()));
+    if (app_id.app_type() == apps::mojom::AppType::kArc) {
+      app_info->add_additional_app_id(
+          app_service_wrapper_->GetAppServiceId(app_id));
+    }
+  }
+}
+
 AppActivityReportInterface::ReportParams
 AppActivityRegistry::GenerateAppActivityReport(
     enterprise_management::ChildStatusReportRequest* report) {

chrome/browser/chromeos/child_accounts/time_limits/app_activity_registry.h

@@ -134,6 +134,9 @@ class AppActivityRegistry : public AppServiceWrapper::EventListener {
   // Reporting enablement is set if |enabled| has value.
   void SetReportingEnabled(base::Optional<bool> enabled);
 
+  void GenerateHiddenApps(
+      enterprise_management::ChildStatusReportRequest* report);
+
   // Populates |report| with collected app activity. Returns whether any data
   // were reported.
   AppActivityReportInterface::ReportParams GenerateAppActivityReport(

chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper.cc

@@ -30,28 +30,6 @@ namespace app_time {
 
 namespace {
 
-// Return whether app with |app_id| should be included for per-app time
-// limits.
-bool ShouldIncludeApp(const AppId& app_id, Profile* profile) {
-  if (app_id.app_type() == apps::mojom::AppType::kExtension) {
-    const extensions::Extension* extension =
-        extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
-            app_id.app_id(),
-            extensions::ExtensionRegistry::IncludeFlag::EVERYTHING);
-
-    // If we are not able to find the extension, return false.
-    if (!extension)
-      return false;
-
-    // Some preinstalled apps that open in browser window are legacy packaged
-    // apps. Example Google Slides app.
-    return extension->is_hosted_app() || extension->is_legacy_packaged_app();
-  }
-
-  return app_id.app_type() == apps::mojom::AppType::kArc ||
-         app_id.app_type() == apps::mojom::AppType::kWeb;
-}
-
 // Gets AppId from |update|.
 AppId AppIdFromAppUpdate(const apps::AppUpdate& update) {
   bool is_arc = update.AppType() == apps::mojom::AppType::kArc;
@@ -123,14 +101,13 @@ void AppServiceWrapper::LaunchApp(const std::string& app_service_id) {
 
 std::vector<AppId> AppServiceWrapper::GetInstalledApps() const {
   std::vector<AppId> installed_apps;
-  Profile* profile = profile_;
   GetAppCache().ForEachApp(
-      [&installed_apps, &profile](const apps::AppUpdate& update) {
+      [&installed_apps, this](const apps::AppUpdate& update) {
         if (update.Readiness() == apps::mojom::Readiness::kUninstalledByUser)
           return;
 
         const AppId app_id = AppIdFromAppUpdate(update);
-        if (!ShouldIncludeApp(app_id, profile))
+        if (!ShouldIncludeApp(app_id))
           return;
 
         installed_apps.push_back(app_id);
@@ -138,6 +115,40 @@ std::vector<AppId> AppServiceWrapper::GetInstalledApps() const {
   return installed_apps;
 }
 
+bool AppServiceWrapper::IsHiddenArcApp(const AppId& app_id) const {
+  if (app_id.app_type() != apps::mojom::AppType::kArc)
+    return false;
+
+  bool is_hidden = false;
+  const std::string app_service_id = AppServiceIdFromAppId(app_id, profile_);
+
+  GetAppCache().ForEachApp([&is_hidden](const apps::AppUpdate& update) {
+    if (update.Readiness() == apps::mojom::Readiness::kUninstalledByUser)
+      return;
+
+    is_hidden = update.ShowInLauncher() == apps::mojom::OptionalBool::kFalse;
+  });
+
+  return is_hidden;
+}
+
+std::vector<AppId> AppServiceWrapper::GetHiddenArcApps() const {
+  std::vector<AppId> hidden_arc_apps;
+  GetAppCache().ForEachApp([&hidden_arc_apps](const apps::AppUpdate& update) {
+    if (update.Readiness() == apps::mojom::Readiness::kUninstalledByUser)
+      return;
+
+    const AppId app_id = AppIdFromAppUpdate(update);
+    if (app_id.app_type() != apps::mojom::AppType::kArc ||
+        update.ShowInLauncher() != apps::mojom::OptionalBool::kFalse) {
+      return;
+    }
+
+    hidden_arc_apps.push_back(app_id);
+  });
+  return hidden_arc_apps;
+}
+
 std::string AppServiceWrapper::GetAppName(const AppId& app_id) const {
   const std::string app_service_id = AppServiceIdFromAppId(app_id, profile_);
   DCHECK(!app_service_id.empty());
@@ -213,7 +224,7 @@ void AppServiceWrapper::OnAppUpdate(const apps::AppUpdate& update) {
     return;
 
   const AppId app_id = AppIdFromAppUpdate(update);
-  if (!ShouldIncludeApp(app_id, profile_))
+  if (!ShouldIncludeApp(app_id))
     return;
 
   switch (update.Readiness()) {
@@ -253,7 +264,7 @@ void AppServiceWrapper::OnInstanceUpdate(const apps::InstanceUpdate& update) {
     return;
 
   const AppId app_id = AppIdFromInstanceUpdate(update, &GetAppCache());
-  if (!ShouldIncludeApp(app_id, profile_))
+  if (!ShouldIncludeApp(app_id))
     return;
 
   bool is_active = update.State() & apps::InstanceState::kActive;
@@ -298,5 +309,28 @@ apps::InstanceRegistry& AppServiceWrapper::GetInstanceRegistry() const {
   return proxy->InstanceRegistry();
 }
 
+bool AppServiceWrapper::ShouldIncludeApp(const AppId& app_id) const {
+  if (IsHiddenArcApp(app_id))
+    return false;
+
+  if (app_id.app_type() == apps::mojom::AppType::kExtension) {
+    const extensions::Extension* extension =
+        extensions::ExtensionRegistry::Get(profile_)->GetExtensionById(
+            app_id.app_id(),
+            extensions::ExtensionRegistry::IncludeFlag::EVERYTHING);
+
+    // If we are not able to find the extension, return false.
+    if (!extension)
+      return false;
+
+    // Some preinstalled apps that open in browser window are legacy packaged
+    // apps. Example Google Slides app.
+    return extension->is_hosted_app() || extension->is_legacy_packaged_app();
+  }
+
+  return app_id.app_type() == apps::mojom::AppType::kArc ||
+         app_id.app_type() == apps::mojom::AppType::kWeb;
+}
+
 }  // namespace app_time
 }  // namespace chromeos

chrome/browser/chromeos/child_accounts/time_limits/app_service_wrapper.h

@@ -114,6 +114,12 @@ class AppServiceWrapper : public apps::AppRegistryCache::Observer,
   // Installed apps of unsupported types will not be included.
   std::vector<AppId> GetInstalledApps() const;
 
+  // Returns true if the application is a hidden arc++ app.
+  bool IsHiddenArcApp(const AppId& app_id) const;
+
+  // Returns the list of arc++ apps hidden from user.
+  std::vector<AppId> GetHiddenArcApps() const;
+
   // Returns short name of the app identified by |app_id|.
   // Might return empty string.
   std::string GetAppName(const AppId& app_id) const;
@@ -155,6 +161,10 @@ class AppServiceWrapper : public apps::AppRegistryCache::Observer,
   apps::AppRegistryCache& GetAppCache() const;
   apps::InstanceRegistry& GetInstanceRegistry() const;
 
+  // Return whether app with |app_id| should be included for per-app time
+  // limits.
+  bool ShouldIncludeApp(const AppId& app_id) const;
+
   base::ObserverList<EventListener> listeners_;
 
   Profile* const profile_;

chrome/browser/chromeos/child_accounts/time_limits/app_time_limit_utils.cc

@@ -12,6 +12,26 @@
 namespace chromeos {
 namespace app_time {
 
+enterprise_management::App::AppType AppTypeForReporting(
+    apps::mojom::AppType type) {
+  switch (type) {
+    case apps::mojom::AppType::kArc:
+      return enterprise_management::App::ARC;
+    case apps::mojom::AppType::kBuiltIn:
+      return enterprise_management::App::BUILT_IN;
+    case apps::mojom::AppType::kCrostini:
+      return enterprise_management::App::CROSTINI;
+    case apps::mojom::AppType::kExtension:
+      return enterprise_management::App::EXTENSION;
+    case apps::mojom::AppType::kPluginVm:
+      return enterprise_management::App::PLUGIN_VM;
+    case apps::mojom::AppType::kWeb:
+      return enterprise_management::App::WEB;
+    default:
+      return enterprise_management::App::UNKNOWN;
+  }
+}
+
 AppId GetChromeAppId() {
   return AppId(apps::mojom::AppType::kExtension, extension_misc::kChromeAppId);
 }

chrome/browser/chromeos/child_accounts/time_limits/app_time_limit_utils.h

@@ -5,12 +5,23 @@
 #ifndef CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_TIME_LIMITS_APP_TIME_LIMIT_UTILS_H_
 #define CHROME_BROWSER_CHROMEOS_CHILD_ACCOUNTS_TIME_LIMITS_APP_TIME_LIMIT_UTILS_H_
 
+#include "components/policy/proto/device_management_backend.pb.h"
+
+namespace apps {
+namespace mojom {
+enum class AppType;
+}
+}  // namespace apps
+
 namespace chromeos {
 namespace app_time {
 
 class AppId;
 enum class AppState;
 
+enterprise_management::App::AppType AppTypeForReporting(
+    apps::mojom::AppType type);
+
 AppId GetChromeAppId();
 
 bool IsWebAppOrExtension(const AppId& app_id);

components/policy/proto/device_management_backend.proto

@@ -3007,7 +3007,10 @@ message ChildStatusReportRequest {
   // It might not be sent in every report.
   repeated AppActivity app_activity = 8;
 
-  // Next id: 9.
+  // A list of applications which are hidden from the user.
+  repeated App hidden_app = 9;
+
+  // Next id: 10.
 }
 
 // Response from DMServer to update user devices' status.