Expose app version when calling getInstalledRelatedApps

Bug: 1013568
Change-Id: I9d5cdcf2175cbdadeda5ac718ae0a9cf137c936b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1831870
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705078}

chrome/android/java/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderImpl.java

@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.installedapp;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
@@ -160,11 +161,28 @@ public class InstalledAppProviderImpl implements InstalledAppProvider {
             }
         }
 
+        for (RelatedApplication installedApp : installedApps) {
+            setVersionInfo(installedApp);
+        }
+
         RelatedApplication[] installedAppsArray = new RelatedApplication[installedApps.size()];
         installedApps.toArray(installedAppsArray);
         return Pair.create(installedAppsArray, delayMillis);
     }
 
+    /**
+     * Sets the version information, if available, to |installedApp|.
+     * @param installedApp
+     */
+    private void setVersionInfo(RelatedApplication installedApp) {
+        assert installedApp.id != null;
+        try {
+            PackageInfo info = mContext.getPackageManager().getPackageInfo(installedApp.id, 0);
+            installedApp.version = info.versionName;
+        } catch (NameNotFoundException e) {
+        }
+    }
+
     /**
      * Returns whether or not the app ID is for an instant app/instant app holdback.
      */

third_party/blink/public/mojom/installedapp/installed_app_provider.mojom

@@ -11,6 +11,7 @@ import "third_party/blink/public/mojom/installedapp/related_application.mojom";
 interface InstalledAppProvider {
   // Filters |related_apps|, keeping only those which are both installed on the
   // user's system, and related to the web origin of the requesting page.
+  // Also appends the app version to the filtered apps.
   FilterInstalledApps(array<RelatedApplication> related_apps)
       => (array<RelatedApplication> installedApps);
 };

third_party/blink/public/mojom/installedapp/related_application.mojom

@@ -13,4 +13,5 @@ struct RelatedApplication {
   // WebRelatedApplication as well).
   string? url;
   string? id;
+  string? version;
 };

third_party/blink/renderer/modules/installedapp/installed_app_controller.cc

@@ -100,6 +100,7 @@ void InstalledAppController::OnFilterInstalledApps(
     app->setPlatform(res->platform);
     app->setURL(res->url);
     app->setId(res->id);
+    app->setVersion(res->version);
     applications.push_back(app);
   }
   callbacks->OnSuccess(applications);

third_party/blink/renderer/modules/installedapp/related_application.idl

@@ -9,4 +9,5 @@ dictionary RelatedApplication {
     required USVString platform;
     USVString url;
     DOMString id;
+    DOMString version;
 };

third_party/blink/web_tests/installedapp/getinstalledrelatedapps.html

@@ -12,8 +12,8 @@ installedapp_test((t, mock) => {
   // list of related_applications from this page's manifest. The mock service
   // returns the empty list, implying that none are installed.
   mock.pushExpectedCall(
-      [{platform: 'play', url: null, id: 'com.test'},
-       {platform: 'itunes', url: 'https://itunes.apple.com/', id: null}],
+      [{platform: 'play', url: null, id: 'com.test', version: null},
+       {platform: 'itunes', url: 'https://itunes.apple.com/', id: null, version: null}],
       []);
   return navigator.getInstalledRelatedApps().then(result => {
     assert_array_relatedapplication_equals(result, []);
@@ -44,13 +44,13 @@ installedapp_test((t, mock) => {
   mock.pushExpectedCall(
       [{platform: 'play', url: null, id: 'com.test'},
        {platform: 'itunes', url: 'https://itunes.apple.com/', id: null}],
-      [{platform: 'play', url: null, id: 'com.test'},
-       {platform: 'itunes', url: 'https://itunes.apple.com/', id: null}]);
+      [{platform: 'play', url: null, id: 'com.test', version: '1.4.2'},
+       {platform: 'itunes', url: 'https://itunes.apple.com/', id: null, version: null}]);
 
   return navigator.getInstalledRelatedApps().then(result => {
     assert_array_relatedapplication_equals(
         result,
-        [{platform: 'play', id: 'com.test'},
+        [{platform: 'play', id: 'com.test', version: '1.4.2'},
          {platform: 'itunes', url: 'https://itunes.apple.com/'}]);
   });
 }, 'getInstalledRelatedApps with multiple related and installed apps');