diff options
| author | 2020-12-22 20:32:50 +0000 | |
|---|---|---|
| committer | 2020-12-22 20:32:50 +0000 | |
| commit | b3eb55e432cde7c5cb7dcbaf60a8347ae2bef329 (patch) | |
| tree | a971d8a304e330a9ac877000205d6b8e6203c158 | |
| parent | 523548f143733a347d3134f18b045004c01d5a6a (diff) | |
| parent | 7f1d2693f0dd090be24f2165652a0d4b2e39c834 (diff) | |
Merge "frameworks/base/wifi: Move migration_samples to non-updatable directory" am: eff887b714 am: 7f1d2693f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533146
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad285dde28e1259a9de2bc08cc3ef9a56f1d2c0a
| -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 |