diff options
Diffstat (limited to 'RROOverlaySampleApp')
| -rw-r--r-- | RROOverlaySampleApp/Android.bp | 13 | ||||
| -rw-r--r-- | RROOverlaySampleApp/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | RROOverlaySampleApp/AndroidManifest_InProcess.xml | 29 |
3 files changed, 2 insertions, 44 deletions
diff --git a/RROOverlaySampleApp/Android.bp b/RROOverlaySampleApp/Android.bp index 0f8265ab3..52c56d966 100644 --- a/RROOverlaySampleApp/Android.bp +++ b/RROOverlaySampleApp/Android.bp @@ -23,16 +23,3 @@ android_app { sdk_version: "current", product_specific: true } - -// In process version of the overlay. -// TODO (b/135938806): Remove this once the overlay tag can support multiple -// targetPackage attributes. -android_app { - name: "InProcessWifiRROOverlaySampleApp", - resource_dirs: [ - "res", - ], - sdk_version: "current", - manifest: "AndroidManifest_InProcess.xml", - product_specific: true -} diff --git a/RROOverlaySampleApp/AndroidManifest.xml b/RROOverlaySampleApp/AndroidManifest.xml index d350624a0..de2e359ac 100644 --- a/RROOverlaySampleApp/AndroidManifest.xml +++ b/RROOverlaySampleApp/AndroidManifest.xml @@ -17,12 +17,12 @@ <!-- Simple app to demonstrate how OEM's can customize the various overlays exposed by the wifi stack --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.wifi.overlay.sample" + package="com.android.wifi.resources.sample" android:versionCode="1" android:versionName="1.0"> <application android:hasCode="false" /> <overlay - android:targetPackage="com.android.wifi" + android:targetPackage="com.android.wifi.resources" android:targetName="WifiCustomization" android:isStatic="true" android:priority="0"/> diff --git a/RROOverlaySampleApp/AndroidManifest_InProcess.xml b/RROOverlaySampleApp/AndroidManifest_InProcess.xml deleted file mode 100644 index cf01a7322..000000000 --- a/RROOverlaySampleApp/AndroidManifest_InProcess.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2019 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. ---> - -<!-- Simple app to demonstrate how OEM's can customize the various overlays exposed by - the wifi stack --> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.wifi.inprocess.overlay.sample" - android:versionCode="1" - android:versionName="1.0"> - <application android:hasCode="false" /> - <overlay - android:targetPackage="com.android.wifi.inprocess" - android:targetName="WifiCustomization" - android:isStatic="true" - android:priority="0"/> -</manifest> |