diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-13 04:28:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-13 04:28:09 +0000 |
| commit | f721a41c716f1cd4655a7c931955df035177d1fc (patch) | |
| tree | d339dafab25553f7c291b0a687ef1188d23d35e4 | |
| parent | fac477631d68bc6f9f067b3ee710eb9350c96dd1 (diff) | |
| parent | 1532c0b8b56e3c82f6779192de8c1a0b41ecd877 (diff) | |
| download | AdServices-f721a41c716f1cd4655a7c931955df035177d1fc.tar.gz | |
Merge "Removed ad_services_config.xml from CtsAdServicesCobaltTest" into udc-mainline-prod
| -rw-r--r-- | adservices/tests/cts/cobalt/AndroidManifestExtServices.xml | 2 | ||||
| -rw-r--r-- | adservices/tests/cts/cobalt/res/xml/ad_services_config.xml | 22 |
2 files changed, 0 insertions, 24 deletions
diff --git a/adservices/tests/cts/cobalt/AndroidManifestExtServices.xml b/adservices/tests/cts/cobalt/AndroidManifestExtServices.xml index 8a2fe2ceb..895e0c588 100644 --- a/adservices/tests/cts/cobalt/AndroidManifestExtServices.xml +++ b/adservices/tests/cts/cobalt/AndroidManifestExtServices.xml @@ -18,8 +18,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.adextservices.tests.cobalt" > <application> - <property android:name="android.adservices.AD_SERVICES_CONFIG" - android:resource="@xml/ad_services_config" /> <uses-library android:name="android.ext.adservices" android:required="false"/> </application> <instrumentation diff --git a/adservices/tests/cts/cobalt/res/xml/ad_services_config.xml b/adservices/tests/cts/cobalt/res/xml/ad_services_config.xml deleted file mode 100644 index 9f7f3b096..000000000 --- a/adservices/tests/cts/cobalt/res/xml/ad_services_config.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2022 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<ad-services-config> - <attribution allowAdPartnersToAccess="com.xyz" allowAllToAccess="false" /> - <custom-audiences allowAllToAccess="false" allowAdPartnersToAccess="com.abc, com.xyz" /> - <topics allowAllToAccess="true" /> -</ad-services-config> - |