Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f1d2693 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "frameworks/base/wifi: Move migration_samples to non-updatable directory" am: eff887b7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533146

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03512fd0a6f9f336182999dca0daa19d65496843
parents ec137273 eff887b7

wifi/non-updatable/java/src/android/net/wifi/WifiMigration.java

+4 −4
Original line number Diff line number Diff line
@@ -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: