diff options
| author | David Su <dysu@google.com> | 2020-12-21 14:50:34 -0800 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2020-12-22 18:07:34 +0000 |
| commit | 9548db78b047bfbd10e7a2f0f4e2f293c19cd568 (patch) | |
| tree | 9f193e6aa2e00a78cefb5cbd7939bc72cbb23d5a /wifi | |
| parent | 512ba3c3d1056cd32b8cc937c8d0fe80149d9d94 (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
Merged-In: Ia95e300da9286d79ee57c285c3bfa88ecc98e326
Change-Id: I495b3edc6e7a6bbb7bae287e8bdd88243e72da70
Diffstat (limited to 'wifi')
| -rwxr-xr-x | wifi/non-updatable/java/src/android/net/wifi/WifiMigration.java | 8 | ||||
| -rw-r--r-- | wifi/non-updatable/migration_samples/README.txt (renamed from wifi/java/android/net/wifi/migration_samples/README.txt) | 0 | ||||
| -rw-r--r-- | wifi/non-updatable/migration_samples/Shared_WifiConfigStore.xml (renamed from wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStore.xml) | 0 | ||||
| -rw-r--r-- | wifi/non-updatable/migration_samples/Shared_WifiConfigStoreSoftAp.xml (renamed from wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStoreSoftAp.xml) | 0 | ||||
| -rw-r--r-- | wifi/non-updatable/migration_samples/User_WifiConfigStore.xml (renamed from wifi/java/android/net/wifi/migration_samples/User_WifiConfigStore.xml) | 0 | ||||
| -rw-r--r-- | wifi/non-updatable/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml (renamed from wifi/java/android/net/wifi/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml) | 0 |
6 files changed, 4 insertions, 4 deletions
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 5792d27a94f9..4fabc0b0babc 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 index 264debaa51f9..264debaa51f9 100644 --- a/wifi/java/android/net/wifi/migration_samples/README.txt +++ b/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 index 3063276fae6a..3063276fae6a 100644 --- a/wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStore.xml +++ b/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 index fd99dd3df8b2..fd99dd3df8b2 100644 --- a/wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStoreSoftAp.xml +++ b/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 index 67d5aab215f2..67d5aab215f2 100644 --- a/wifi/java/android/net/wifi/migration_samples/User_WifiConfigStore.xml +++ b/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 index 4ecdd29709b4..4ecdd29709b4 100644 --- a/wifi/java/android/net/wifi/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml +++ b/wifi/non-updatable/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml |