Revert "Add timestamp in scan results"

Temporarily reverting this until all devices switch to using wpa_supplicant_8.

This reverts commit b31f78f93768fef269617ec788a5c6655a375f80.

Change-Id: I33fcb8415288d95289dcd46fa71e950e0f2b87ec
Signed-off-by: Iliyan Malchev <malchev@google.com>

1 files changed, 4 insertions, 26 deletions

diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java
index 3e20756..32261de 100644
--- a/wifi/java/android/net/wifi/ScanResult.java
+++ b/wifi/java/android/net/wifi/ScanResult.java
@@ -47,37 +47,19 @@ public class ScanResult implements Parcelable {
     public int frequency;
 
     /**
-     * Time Synchronization Function (tsf) timestamp in microseconds when
-     * this result was last seen.
-     */
-     public long timestamp;
-
-    /**
      * We'd like to obtain the following attributes,
      * but they are not reported via the socket
      * interface, even though they are known
      * internally by wpa_supplicant.
      * {@hide}
      */
-    public ScanResult(String SSID, String BSSID, String caps, int level, int frequency, long tsf) {
+    public ScanResult(String SSID, String BSSID, String caps, int level, int frequency) {
         this.SSID = SSID;
         this.BSSID = BSSID;
         this.capabilities = caps;
         this.level = level;
         this.frequency = frequency;
-        this.timestamp = tsf;
-    }
-
-    /** copy constructor {@hide} */
-    public ScanResult(ScanResult source) {
-        if (source != null) {
-            SSID = source.SSID;
-            BSSID = source.BSSID;
-            capabilities = source.capabilities;
-            level = source.level;
-            frequency = source.frequency;
-            timestamp = source.timestamp;
-        }
+        //networkConfig = null;
     }
 
     @Override
@@ -94,9 +76,7 @@ public class ScanResult implements Parcelable {
             append(", level: ").
             append(level).
             append(", frequency: ").
-            append(frequency).
-            append(", timestamp: ").
-            append(timestamp);
+            append(frequency);
 
         return sb.toString();
     }
@@ -113,7 +93,6 @@ public class ScanResult implements Parcelable {
         dest.writeString(capabilities);
         dest.writeInt(level);
         dest.writeInt(frequency);
-        dest.writeLong(timestamp);
     }
 
     /** Implement the Parcelable interface {@hide} */
@@ -125,8 +104,7 @@ public class ScanResult implements Parcelable {
                     in.readString(),
                     in.readString(),
                     in.readInt(),
-                    in.readInt(),
-                    in.readLong()
+                    in.readInt()
                 );
             }