Merge "Add isSubscription(), getSsid() API to WifiEntry"

3 files changed, 22 insertions, 3 deletions

diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index 426f26f40..7f6fb7004 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -154,6 +154,11 @@ class StandardWifiEntry extends WifiEntry {
     }
 
     @Override
+    public String getSsid() {
+        return mSsid;
+    }
+
+    @Override
     @Security
     public int getSecurity() {
         // TODO(b/70983952): Fill this method in
@@ -178,6 +183,11 @@ class StandardWifiEntry extends WifiEntry {
     }
 
     @Override
+    public boolean isSubscription() {
+        return false;
+    }
+
+    @Override
     public WifiConfiguration getWifiConfiguration() {
         return mWifiConfig;
     }
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
index 274770bbe..4caa312c3 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
@@ -165,6 +165,11 @@ public abstract class WifiEntry implements Comparable<WifiEntry> {
      */
     public abstract int getLevel();
 
+    /**
+     * Returns the SSID of the entry, if applicable. Null otherwise.
+     */
+    public abstract String getSsid();
+
     /** Returns the security type defined by the SECURITY constants */
     @Security
     public abstract int getSecurity();
@@ -184,6 +189,11 @@ public abstract class WifiEntry implements Comparable<WifiEntry> {
     public abstract boolean isSaved();
 
     /**
+     * Indicates whether or not an entry is for a subscription.
+     */
+    public abstract boolean isSubscription();
+
+    /**
      * Returns the WifiConfiguration of an entry or null if unavailable. This should be used when
      * information on the WifiConfiguration needs to be modified and saved via
      * {@link WifiManager#save(WifiConfiguration, WifiManager.ActionListener)}.
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
index 294b23b25..345bdce06 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
@@ -19,7 +19,6 @@ package com.android.wifitrackerlib;
 import static com.android.wifitrackerlib.TestUtils.buildScanResult;
 import static com.android.wifitrackerlib.WifiEntry.CONNECTED_STATE_CONNECTED;
 import static com.android.wifitrackerlib.WifiEntry.CONNECTED_STATE_DISCONNECTED;
-import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_MAX;
 import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_UNREACHABLE;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -316,12 +315,12 @@ public class StandardWifiEntryTest {
         final StandardWifiEntry entry = new StandardWifiEntry(mTestHandler, config,
                 mMockWifiManager);
         when(mMockWifiInfo.getNetworkId()).thenReturn(1);
-        when(mMockWifiInfo.getRssi()).thenReturn(-50);
+        when(mMockWifiInfo.getRssi()).thenReturn(GOOD_RSSI);
         when(mMockNetworkInfo.getDetailedState()).thenReturn(NetworkInfo.DetailedState.CONNECTED);
 
         entry.updateConnectionInfo(mMockWifiInfo, mMockNetworkInfo);
 
-        assertThat(entry.getLevel()).isEqualTo(WIFI_LEVEL_MAX);
+        assertThat(entry.getLevel()).isEqualTo(GOOD_LEVEL);
         assertThat(entry.getConnectedState()).isEqualTo(CONNECTED_STATE_CONNECTED);
     }