| commit | 8814f7f4f215d69edfcdea4514c6ff34efef9ca6 | [log] [tgz] |
|---|---|---|
| author | David Su <dysu@google.com> | Mon Dec 21 14:50:34 2020 -0800 |
| committer | David Su <dysu@google.com> | Mon Dec 21 14:50:34 2020 -0800 |
| tree | 396775e32897961f49d92d20de26e8c0f115e30b | |
| parent | e7cc3ae663470506e53da5e3342ab2d99950cd79 [diff] |
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 Change-Id: I38b6eeb6d784cc6e2a87f0161b32be180ade3bdc
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 5792d27..4fabc0b 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 @@ /** * 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 @@ /** * 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