From ab9ee6d092bd527ba910c995376f3fc1f64063a7 Mon Sep 17 00:00:00 2001
From: Nate Chapin <[email protected]>
Date: Mon, 20 Jul 2026 13:03:13 -0700
Subject: [PATCH] [TWA] Derive precise geolocation tier from FINE OS grant

InstalledWebappBridge mapped a single any-of ACCESS_COARSE_LOCATION /
ACCESS_FINE_LOCATION grant to both fields of GeolocationSetting, so a
TWA whose wrapper app held only ACCESS_COARSE_LOCATION was reported as
precise=Allowed.

Thread a separate preciseSetting through the
InstalledWebappBridge.Permission POD, populated from a new
hasAndroidFineLocationPermission() check, and use it for the precise
member of GeolocationSetting in GetInstalledWebappPermissions(). The
approximate tier keeps the existing any-of semantics.

TAG=agy
CONV=b71eacbb-9620-4275-a780-1697b5d00cfd

Fixed: 513119757
Change-Id: I6186412fe145d115309637db0961febe842d088e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8112120
Reviewed-by: Dibyajyoti Pal <[email protected]>
Reviewed-by: Peter Conn <[email protected]>
Commit-Queue: Nate Chapin <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1664876}
---

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java
index 40b838d..4f9475e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java
@@ -31,19 +31,24 @@
      * A POD class to store the combination of a permission setting and the origin the permission is
      * relevant for.
      *
-     * It would make more sense for this to be a subclass of
-     * {@link InstalledWebappPermissionManager} or a top level class. Unfortunately for the JNI
-     * tool to be able to handle passing a class over the JNI boundary the class either needs to be
-     * in this file or imported explicitly. Our presubmits don't like explicitly importing classes
-     * that we don't need to, so it's easier to just let the class live here.
+     * <p>It would make more sense for this to be a subclass of {@link
+     * InstalledWebappPermissionManager} or a top level class. Unfortunately for the JNI tool to be
+     * able to handle passing a class over the JNI boundary the class either needs to be in this
+     * file or imported explicitly. Our presubmits don't like explicitly importing classes that we
+     * don't need to, so it's easier to just let the class live here.
      */
     static class Permission {
         public final Origin origin;
+        // The primary permission setting. For Geolocation, this represents the approximate setting.
         public final @ContentSetting int setting;
+        // The precise permission setting. Only used for Geolocation.
+        public final @ContentSetting int preciseSetting;
 
-        public Permission(Origin origin, @ContentSetting int setting) {
+        public Permission(
+                Origin origin, @ContentSetting int setting, @ContentSetting int preciseSetting) {
             this.origin = origin;
             this.setting = setting;
+            this.preciseSetting = preciseSetting;
         }
     }
 
@@ -81,6 +86,11 @@
     }
 
     @CalledByNative
+    private static int getPreciseSettingFromPermission(Permission permission) {
+        return permission.preciseSetting;
+    }
+
+    @CalledByNative
     private static void decidePermission(
             @ContentSettingsType.EnumType int type,
             @JniType("std::string") String originUrl,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappPermissionManager.java b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappPermissionManager.java
index 41d82165..7ff0084 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappPermissionManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappPermissionManager.java
@@ -77,7 +77,19 @@
             @ContentSetting int setting = getPermission(type, origin);
 
             if (setting != ContentSetting.DEFAULT) {
-                permissions.add(new InstalledWebappBridge.Permission(origin, setting));
+                @ContentSetting int preciseSetting = setting;
+                if (type == ContentSettingsType.GEOLOCATION_WITH_OPTIONS) {
+                    String packageName = getDelegatePackageName(origin);
+                    Boolean fineEnabled = hasAndroidFineLocationPermission(packageName);
+                    if (setting == ContentSetting.ALLOW) {
+                        preciseSetting =
+                                (fineEnabled != null && fineEnabled)
+                                        ? ContentSetting.ALLOW
+                                        : ContentSetting.BLOCK;
+                    }
+                }
+                permissions.add(
+                        new InstalledWebappBridge.Permission(origin, setting, preciseSetting));
             }
         }
 
@@ -245,6 +257,14 @@
     }
 
     /**
+     * Returns whether the delegate application for the origin has Android fine location permission,
+     * or {@code null} if it does not exist or did not request fine location permission.
+     */
+    public static @Nullable Boolean hasAndroidFineLocationPermission(@Nullable String packageName) {
+        return hasAndroidPermissions(packageName, new String[] {ACCESS_FINE_LOCATION});
+    }
+
+    /**
      * Returns whether the delegate application for the origin has any of specific Android
      * permissions, or {@code null} if it does not exist or did not request those permissions.
      */
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappPermissionManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappPermissionManagerTest.java
index de210a1..b605d70 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappPermissionManagerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappPermissionManagerTest.java
@@ -12,6 +12,7 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -34,9 +35,12 @@
 import org.robolectric.shadows.ShadowPackageManager;
 import org.robolectric.util.ReflectionHelpers;
 
+import org.chromium.base.ActivityState;
+import org.chromium.base.ApplicationStatus;
 import org.chromium.base.FeatureOverrides;
 import org.chromium.base.test.BaseRobolectricTestRule;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.components.content_settings.ContentSetting;
 import org.chromium.components.content_settings.ContentSettingsType;
@@ -45,6 +49,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 /** Tests for {@link InstalledWebappPermissionManager}. */
 @RunWith(ParameterizedRobolectricTestRunner.class)
@@ -237,4 +242,89 @@
                 .setStateForOrigin(
                         eq(mOrigin), eq(PACKAGE_NAME), anyString(), eq(mType), eq(settingValue));
     }
+
+    @Test
+    @Feature("TrustedWebActivities")
+    public void getPermissions_distinguishesPreciseFromApproximate() {
+        if (mType != ContentSettingsType.GEOLOCATION_WITH_OPTIONS) {
+            return;
+        }
+
+        // Mock store to return our origin.
+        when(mStore.getStoredOrigins()).thenReturn(Collections.singleton(mOrigin.toString()));
+
+        // Mock CustomTabActivity.
+        CustomTabActivity activity = mock(CustomTabActivity.class);
+        when(activity.isInTwaMode()).thenReturn(true);
+
+        // Register activity with ApplicationStatus.
+        // We need to transition it to CREATED then RESUMED to mimic lifecycle.
+        ApplicationStatus.onStateChangeForTesting(activity, ActivityState.CREATED);
+        ApplicationStatus.onStateChangeForTesting(activity, ActivityState.RESUMED);
+
+        try {
+            // Scenario 1: Coarse only granted.
+            {
+                PackageInfo packageInfo = new PackageInfo();
+                packageInfo.packageName = PACKAGE_NAME;
+                packageInfo.requestedPermissions = new String[] {ACCESS_COARSE_LOCATION};
+                packageInfo.requestedPermissionsFlags =
+                        new int[] {PackageInfo.REQUESTED_PERMISSION_GRANTED};
+                mShadowPackageManager.installPackage(packageInfo);
+
+                setStoredLocationPermission(ContentSetting.ALLOW);
+
+                InstalledWebappBridge.Permission[] permissions =
+                        InstalledWebappPermissionManager.getPermissions(mType);
+                assertEquals(1, permissions.length);
+                assertEquals(mOrigin, permissions[0].origin);
+                assertEquals(ContentSetting.ALLOW, permissions[0].setting); // approximate
+                assertEquals(ContentSetting.BLOCK, permissions[0].preciseSetting); // precise
+            }
+
+            // Scenario 2: Both granted.
+            {
+                PackageInfo packageInfo = new PackageInfo();
+                packageInfo.packageName = PACKAGE_NAME;
+                packageInfo.requestedPermissions =
+                        new String[] {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION};
+                packageInfo.requestedPermissionsFlags =
+                        new int[] {