From 9548db78b047bfbd10e7a2f0f4e2f293c19cd568 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Mon, 21 Dec 2020 14:50:34 -0800
Subject: [PATCH] frameworks/base/wifi: Move migration_samples to non-updatable
 directory

This is not part of the Wifi module, move it to the non-updatable
directory.

Bug: 176105484
Test: compiles
Merged-In: Ia95e300da9286d79ee57c285c3bfa88ecc98e326
Change-Id: I495b3edc6e7a6bbb7bae287e8bdd88243e72da70
---
 .../java/src/android/net/wifi/WifiMigration.java          | 8 ++++----
 .../wifi => non-updatable}/migration_samples/README.txt   | 0
 .../migration_samples/Shared_WifiConfigStore.xml          | 0
 .../migration_samples/Shared_WifiConfigStoreSoftAp.xml    | 0
 .../migration_samples/User_WifiConfigStore.xml            | 0
 .../User_WifiConfigStoreNetworkSuggestions.xml            | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename wifi/{java/android/net/wifi => non-updatable}/migration_samples/README.txt (100%)
 rename wifi/{java/android/net/wifi => non-updatable}/migration_samples/Shared_WifiConfigStore.xml (100%)
 rename wifi/{java/android/net/wifi => non-updatable}/migration_samples/Shared_WifiConfigStoreSoftAp.xml (100%)
 rename wifi/{java/android/net/wifi => non-updatable}/migration_samples/User_WifiConfigStore.xml (100%)
 rename wifi/{java/android/net/wifi => non-updatable}/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml (100%)

diff --git a/wifi/non-updatable/java/src/android/net/wifi/WifiMigration.java b/wifi/non-updatable/java/src/android/net/wifi/WifiMigration.java
index 5792d27a94f99..4fabc0b0babc3 100755
--- a/wifi/non-updatable/java/src/android/net/wifi/WifiMigration.java
+++ b/wifi/non-updatable/java/src/android/net/wifi/WifiMigration.java
@@ -139,8 +139,8 @@ public final class WifiMigration {
     /**
      * Load data from legacy shared wifi config store file.
      * <p>
-     * Expected AOSP format is available in the sample files under {@code /frameworks/base/wifi/
-     * java/android/net/wifi/migration_samples}.
+     * Expected AOSP format is available in the sample files under {@code
+     * frameworks/base/wifi/non-updatable/migration_samples/}.
      * </p>
      * <p>
      * Note:
@@ -218,8 +218,8 @@ public final class WifiMigration {
     /**
      * Load data from legacy user wifi config store file.
      * <p>
-     * Expected AOSP format is available in the sample files under {@code /frameworks/base/wifi/
-     * java/android/net/wifi/migration_samples}.
+     * Expected AOSP format is available in the sample files under {@code
+     * frameworks/base/wifi/non-updatable/migration_samples/}.
      * </p>
      * <p>
      * Note:
diff --git a/wifi/java/android/net/wifi/migration_samples/README.txt b/wifi/non-updatable/migration_samples/README.txt
similarity index 100%
rename from wifi/java/android/net/wifi/migration_samples/README.txt
rename to wifi/non-updatable/migration_samples/README.txt
diff --git a/wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStore.xml b/wifi/non-updatable/migration_samples/Shared_WifiConfigStore.xml
similarity index 100%
rename from wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStore.xml
rename to wifi/non-updatable/migration_samples/Shared_WifiConfigStore.xml
diff --git a/wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStoreSoftAp.xml b/wifi/non-updatable/migration_samples/Shared_WifiConfigStoreSoftAp.xml
similarity index 100%
rename from wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStoreSoftAp.xml
rename to wifi/non-updatable/migration_samples/Shared_WifiConfigStoreSoftAp.xml
diff --git a/wifi/java/android/net/wifi/migration_samples/User_WifiConfigStore.xml b/wifi/non-updatable/migration_samples/User_WifiConfigStore.xml
similarity index 100%
rename from wifi/java/android/net/wifi/migration_samples/User_WifiConfigStore.xml
rename to wifi/non-updatable/migration_samples/User_WifiConfigStore.xml
diff --git a/wifi/java/android/net/wifi/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml b/wifi/non-updatable/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml
similarity index 100%
rename from wifi/java/android/net/wifi/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml
rename to wifi/non-updatable/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml