commit d037d04dc4d1e2b2ce7da5efb5d863ddbdd589ed
author Jeff Davidson <jpd@google.com> Thu Aug 28 17:25:58 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 28 17:25:58 2014 +0000
tree 46ecf2bc1f225aae2005950614a0f956eb7bd5e1
parent f04d69a1d405f88b2bebacd63c77e91789e81616
parent 0a5402dcf9592a81f55d80dcd37629402c0dc856

Merge "Fix crash in WifiSettings." into lmp-dev

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index cf81ee3..abf4de8 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -101,7 +101,7 @@
     private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
     private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
 
-    private static final String KEY_ASSISTANT_DISMISS_PLATFORM = "wifi_assistant_dismiss_platform";
+    private static final String KEY_ASSISTANT_DISMISS_PLATFORM = "assistant_dismiss_platform";
 
     public static final int WIFI_DIALOG_ID = 1;
     /* package */ static final int WPS_PBC_DIALOG_ID = 2;
@@ -768,7 +768,7 @@
     private void disableWifiAssistantCardUntilPlatformUpgrade() {
         SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
         SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putLong(KEY_ASSISTANT_DISMISS_PLATFORM, Build.VERSION.SDK_INT);
+        editor.putInt(KEY_ASSISTANT_DISMISS_PLATFORM, Build.VERSION.SDK_INT);
         editor.apply();
     }