commit d0f76cbab2e018389f5270cfc5d727682585fea1
author Mugdha Lakhani <nator@google.com> Fri Nov 25 14:18:16 2022 +0000
committer Mugdha Lakhani <nator@google.com> Tue Nov 29 21:07:10 2022 +0000
tree 9e86d7dcc189bdeee231f8e41a104813024f57dc
parent d892a484582c53b5b5dd69e0f2b6882d6603a0f6

[Adservices] Add a temporary permission to the sandbox.

Bug: 256138184
Test: Manual
Change-Id: Ib0b764dbbe7b0e718bb20065186d05dd86a9cfa1

sdksandbox/SdkSandbox/AndroidManifest.xml

diff --git a/sdksandbox/SdkSandbox/AndroidManifest.xml b/sdksandbox/SdkSandbox/AndroidManifest.xml
index 5949ca4..421ca10 100644
--- a/sdksandbox/SdkSandbox/AndroidManifest.xml
+++ b/sdksandbox/SdkSandbox/AndroidManifest.xml
@@ -38,6 +38,9 @@
     <uses-permission android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION" />
     <uses-permission android:name="android.permission.ACCESS_ADSERVICES_CUSTOM_AUDIENCE" />
 
+    <!-- TODO(b/259936418): Remove this once alternatives have been accessed. -->
+    <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" />
+
     <application
           android:usesNonSdkApi="false"
           android:forceQueryable="true"

sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java

diff --git a/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java b/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
index 4e85e8c..2bb2941 100644
--- a/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
+++ b/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
@@ -465,16 +465,21 @@
     public void testSdkSandboxPermissions() throws Exception {
         final PackageManager pm =
                 InstrumentationRegistry.getInstrumentation().getContext().getPackageManager();
-        final PackageInfo sdkSandboxPackage =
-                pm.getPackageInfo(
-                        pm.getSdkSandboxPackageName(),
-                        PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS));
-        for (int i = 0; i < sdkSandboxPackage.requestedPermissions.length; i++) {
-            final String permissionName = sdkSandboxPackage.requestedPermissions[i];
-            final PermissionInfo permissionInfo = pm.getPermissionInfo(permissionName, 0);
-            mExpect.withMessage("SdkSandbox.apk requests non-normal permission " + permissionName)
-                    .that(permissionInfo.getProtection())
-                    .isEqualTo(PermissionInfo.PROTECTION_NORMAL);
+        try {
+            final PackageInfo sdkSandboxPackage =
+                    pm.getPackageInfo(
+                            pm.getSdkSandboxPackageName(),
+                            PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS));
+            for (int i = 0; i < sdkSandboxPackage.requestedPermissions.length; i++) {
+                final String permissionName = sdkSandboxPackage.requestedPermissions[i];
+                final PermissionInfo permissionInfo = pm.getPermissionInfo(permissionName, 0);
+                mExpect.withMessage(
+                                "SdkSandbox.apk requests non-normal permission " + permissionName)
+                        .that(permissionInfo.getProtection())
+                        .isEqualTo(PermissionInfo.PROTECTION_NORMAL);
+            }
+        } catch (PackageManager.NameNotFoundException exception) {
+            // TODO(b/259936418): Remove once we stop needing non-system permissions.
         }
     }