Merge "Remove sample overlay app" into rvc-dev

5 files changed, 2 insertions, 80 deletions

diff --git a/RROOverlaySampleApp/Android.bp b/RROOverlaySampleApp/Android.bp
deleted file mode 100644
index 0ce841fd2..000000000
--- a/RROOverlaySampleApp/Android.bp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// 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.
-//
-
-android_app {
-    name: "WifiRROOverlaySampleApp",
-    resource_dirs: [
-        "res",
-    ],
-    manifest: "AndroidManifest.xml",
-    sdk_version: "current"
-}
diff --git a/RROOverlaySampleApp/AndroidManifest.xml b/RROOverlaySampleApp/AndroidManifest.xml
deleted file mode 100644
index de2e359ac..000000000
--- a/RROOverlaySampleApp/AndroidManifest.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.resources.sample"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.wifi.resources"
-      android:targetName="WifiCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/RROOverlaySampleApp/Readme.txt b/RROOverlaySampleApp/Readme.txt
index abcd51e55..eb437756c 100644
--- a/RROOverlaySampleApp/Readme.txt
+++ b/RROOverlaySampleApp/Readme.txt
@@ -1,6 +1,4 @@
-RROOverlaySampleApp:
-a) This sample app demonstrates how OEMs can override any of the overlay flags
-exposed by the wifi mainline module.
+a) Please see `device/google/coral/rro_overlays/WifiOverlay/` for a sample overlay app.
 b) The list of values that can be overlayed are listed in service/res/values/overlayable.xml.
 c) OEMs can add the flags they want to override in res/values/config.xml of this sample app
 and put the sample app in either system, product or vendor partition of the device.
diff --git a/RROOverlaySampleApp/res/values/config.xml b/RROOverlaySampleApp/res/values/config.xml
deleted file mode 100644
index 08b0430a8..000000000
--- a/RROOverlaySampleApp/res/values/config.xml
+++ /dev/null
@@ -1,23 +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.
- */
--->
-<!-- Overrides the default value of the specified config values when this sample app is installed -->
-<resources>
-    <bool translatable="false" name="config_wifi5ghzSupport">true</bool>
-    <bool translatable="false" name="config_wifi_connected_mac_randomization_supported">true</bool>
-</resources>
diff --git a/service/res/values/overlayable.xml b/service/res/values/overlayable.xml
index 60454728d..d0dd87525 100644
--- a/service/res/values/overlayable.xml
+++ b/service/res/values/overlayable.xml
@@ -13,7 +13,7 @@
 
 <!-- These values can be used to control wifi stack behavior/features on individual devices.
      These can be overridden by OEM's by using an RRO overlay app.
-     There is a sample RRO overlay app under frameworks/opt/net/wifi/RROOverlaySampleApp -->
+     See device/google/coral/rro_overlays/WifiOverlay/ for a sample overlay app. -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <overlayable name="WifiCustomization">
         <!-- START VENDOR CUSTOMIZATION -->