Merge "Add decode-to-ANativeWindow support to Stagefright."
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 1dd2e8f..3d69249 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -223,6 +223,7 @@
      * @hide for now, pending API council approval.
      */
     public static class AutoFillProfile {
+        private int mUniqueId;
         private String mFullName;
         private String mEmailAddress;
         private String mCompanyName;
@@ -234,10 +235,11 @@
         private String mCountry;
         private String mPhoneNumber;
 
-        public AutoFillProfile(String fullName, String email,
+        public AutoFillProfile(int uniqueId, String fullName, String email,
                 String companyName, String addressLine1, String addressLine2,
                 String city, String state, String zipCode, String country,
                 String phoneNumber) {
+            mUniqueId = uniqueId;
             mFullName = fullName;
             mEmailAddress = email;
             mCompanyName = companyName;
@@ -250,6 +252,7 @@
             mPhoneNumber = phoneNumber;
         }
 
+        public int getUniqueId() { return mUniqueId; }
         public String getFullName() { return mFullName; }
         public String getEmailAddress() { return mEmailAddress; }
         public String getCompanyName() { return mCompanyName; }
@@ -1613,8 +1616,10 @@
      * @hide
      */
     public synchronized void setAutoFillProfile(AutoFillProfile profile) {
-        mAutoFillProfile = profile;
-        postSync();
+        if (mAutoFillProfile != profile) {
+            mAutoFillProfile = profile;
+            postSync();
+        }
     }
 
     int getDoubleTapToastCount() {
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 6ef3907..3a9d272 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2149,14 +2149,6 @@
 
             /* Initialize channel count */
             setNumAllowedChannels();
-            /*
-             * STOPSHIP
-             * TODO: We are having 11A issues that Broadcom is looking
-             * to resolve, this is a temporary fix to allow only 11B/G
-             * and help improve GoogleGuest connectivity
-             * We also need to add the UI for band control
-             */
-            WifiNative.setBandCommand(BAND_2G);
 
             if (mIsScanMode) {
                 WifiNative.setScanResultHandlingCommand(SCAN_ONLY_MODE);