commit 30c4c5e0c050ef6fcfbda2c98a7f569fae5fcb3c
author android-build-team Robot <android-build-team-robot@google.com> Tue Nov 13 00:22:09 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Nov 13 00:22:09 2018 +0000
tree c12c0166897ace61f067e235d499de5f56074c7a
parent 18ecd6d80a165d09eceb111f8aca5273bec77364
parent e99d5b8923eb7d645cb3e4e1d4bfab49274eba7e

Merge cherrypicks of [5503807, 5503110, 5503120] into qt-release

Change-Id: I29e5023812d71671db8490a5121af1234c79b600

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 523361d..22d5d83 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -158,11 +158,11 @@
      * These values are matched in string arrays -- changes must be kept in sync
      */
     public static final int SECURITY_NONE = 0;
-    public static final int SECURITY_OWE = 1;
-    public static final int SECURITY_WEP = 2;
-    public static final int SECURITY_PSK = 3;
-    public static final int SECURITY_SAE = 4;
-    public static final int SECURITY_EAP = 5;
+    public static final int SECURITY_WEP = 1;
+    public static final int SECURITY_PSK = 2;
+    public static final int SECURITY_EAP = 3;
+    public static final int SECURITY_OWE = 4;
+    public static final int SECURITY_SAE = 5;
     public static final int SECURITY_EAP_SUITE_B = 6;
 
     private static final int PSK_UNKNOWN = 0;