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
This commit is contained in:
Treehugger Robot
2020-12-22 20:32:50 +00:00
committed by Automerger Merge Worker
6 changed files with 4 additions and 4 deletions

View File

@@ -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: