Merge "Extension API: Comments from API review council are addressed" into rvc-dev

2 files changed, 40 insertions, 40 deletions

diff --git a/service/java/com/android/server/wifi/WifiScoreReport.java b/service/java/com/android/server/wifi/WifiScoreReport.java
index 200499b34..a4226e5fc 100644
--- a/service/java/com/android/server/wifi/WifiScoreReport.java
+++ b/service/java/com/android/server/wifi/WifiScoreReport.java
@@ -18,7 +18,7 @@ package com.android.server.wifi;
 
 import android.net.Network;
 import android.net.NetworkAgent;
-import android.net.wifi.IScoreChangeCallback;
+import android.net.wifi.IScoreUpdateObserver;
 import android.net.wifi.IWifiConnectedNetworkScorer;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.nl80211.WifiNl80211Manager;
@@ -75,11 +75,11 @@ public class WifiScoreReport {
     WifiThreadRunner mWifiThreadRunner;
 
     /**
-     * Callback proxy. See {@link WifiManager#ScoreChangeCallback}.
+     * Callback proxy. See {@link WifiManager#ScoreUpdateObserver}.
      */
-    private class ScoreChangeCallbackProxy extends IScoreChangeCallback.Stub {
+    private class ScoreUpdateObserverProxy extends IScoreUpdateObserver.Stub {
         @Override
-        public void onScoreChange(int sessionId, int score) {
+        public void notifyScoreUpdate(int sessionId, int score) {
             mWifiThreadRunner.post(() -> {
                 if (mWifiConnectedNetworkScorerHolder == null) {
                     return;
@@ -106,7 +106,7 @@ public class WifiScoreReport {
         }
 
         @Override
-        public void onTriggerUpdateOfWifiUsabilityStats(int sessionId) {
+        public void triggerUpdateOfWifiUsabilityStats(int sessionId) {
             mWifiThreadRunner.post(() -> {
                 if (mWifiConnectedNetworkScorerHolder == null) {
                     return;
@@ -230,8 +230,8 @@ public class WifiScoreReport {
         }
     }
 
-    private final ScoreChangeCallbackProxy mScoreChangeCallback =
-            new ScoreChangeCallbackProxy();
+    private final ScoreUpdateObserverProxy mScoreUpdateObserver =
+            new ScoreUpdateObserverProxy();
 
     private WifiConnectedNetworkScorerHolder mWifiConnectedNetworkScorerHolder;
 
@@ -529,9 +529,9 @@ public class WifiScoreReport {
         mWifiConnectedNetworkScorerHolder = scorerHolder;
 
         try {
-            scorer.setScoreChangeCallback(mScoreChangeCallback);
+            scorer.onSetScoreUpdateObserver(mScoreUpdateObserver);
         } catch (RemoteException e) {
-            Log.e(TAG, "Unable to set score change callback " + scorer, e);
+            Log.e(TAG, "Unable to set score update observer " + scorer, e);
             revertAospConnectedScorer();
             return false;
         }
@@ -565,7 +565,7 @@ public class WifiScoreReport {
         }
         try {
             IWifiConnectedNetworkScorer scorer = mWifiConnectedNetworkScorerHolder.getScorer();
-            scorer.start(sessionId);
+            scorer.onStart(sessionId);
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to start Wifi connected network scorer "
                     + mWifiConnectedNetworkScorerHolder, e);
@@ -583,7 +583,7 @@ public class WifiScoreReport {
         }
         try {
             IWifiConnectedNetworkScorer scorer = mWifiConnectedNetworkScorerHolder.getScorer();
-            scorer.stop(mSessionId);
+            scorer.onStop(mSessionId);
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to stop Wifi connected network scorer "
                     + mWifiConnectedNetworkScorerHolder, e);
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
index b0a36575b..41775ec25 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
@@ -44,7 +44,7 @@ import android.net.Network;
 import android.net.NetworkAgent;
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
-import android.net.wifi.IScoreChangeCallback;
+import android.net.wifi.IScoreUpdateObserver;
 import android.net.wifi.IWifiConnectedNetworkScorer;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
@@ -103,19 +103,19 @@ public class WifiScoreReportTest extends WifiBaseTest {
     private TestLooper mLooper;
 
     public class WifiConnectedNetworkScorerImpl extends IWifiConnectedNetworkScorer.Stub {
-        public IScoreChangeCallback mScoreChangeCallback;
+        public IScoreUpdateObserver mScoreUpdateObserver;
         public int mSessionId = -1;
 
         @Override
-        public void start(int sessionId) {
+        public void onStart(int sessionId) {
             mSessionId = sessionId;
         }
         @Override
-        public void stop(int sessionId) {
+        public void onStop(int sessionId) {
         }
         @Override
-        public void setScoreChangeCallback(IScoreChangeCallback cbImpl) {
-            mScoreChangeCallback = cbImpl;
+        public void onSetScoreUpdateObserver(IScoreUpdateObserver observerImpl) {
+            mScoreUpdateObserver = observerImpl;
         }
     }
 
@@ -568,7 +568,7 @@ public class WifiScoreReportTest extends WifiBaseTest {
         // Register Client for verification.
         mWifiScoreReport.setWifiConnectedNetworkScorer(mAppBinder, mWifiConnectedNetworkScorer);
         // Client should get ScoreChangeCallback.
-        verify(mWifiConnectedNetworkScorer).setScoreChangeCallback(any());
+        verify(mWifiConnectedNetworkScorer).onSetScoreUpdateObserver(any());
     }
 
     /**
@@ -582,7 +582,7 @@ public class WifiScoreReportTest extends WifiBaseTest {
         verify(mAppBinder).unlinkToDeath(any(), anyInt());
 
         mWifiScoreReport.startConnectedNetworkScorer(10);
-        verify(mWifiConnectedNetworkScorer, never()).start(anyInt());
+        verify(mWifiConnectedNetworkScorer, never()).onStart(anyInt());
     }
 
     /**
@@ -605,11 +605,11 @@ public class WifiScoreReportTest extends WifiBaseTest {
         verify(mAppBinder).linkToDeath(any(IBinder.DeathRecipient.class), anyInt());
 
         // Client should not get any message when scorer add failed.
-        verify(mWifiConnectedNetworkScorer, never()).setScoreChangeCallback(any());
+        verify(mWifiConnectedNetworkScorer, never()).onSetScoreUpdateObserver(any());
     }
 
     /**
-     * Verify that client gets session ID when start method is called.
+     * Verify that client gets session ID when onStart() method is called.
      */
     @Test
     public void testClientGetSessionIdOnStart() throws Exception {
@@ -617,12 +617,12 @@ public class WifiScoreReportTest extends WifiBaseTest {
         // Register Client for verification.
         mWifiScoreReport.setWifiConnectedNetworkScorer(mAppBinder, mWifiConnectedNetworkScorer);
         mWifiScoreReport.startConnectedNetworkScorer(TEST_SESSION_ID);
-        verify(mWifiConnectedNetworkScorer).start(startId.capture());
+        verify(mWifiConnectedNetworkScorer).onStart(startId.capture());
         assertEquals((int) startId.getValue(), TEST_SESSION_ID);
     }
 
     /**
-     * Verify that client gets session ID when stop method is called.
+     * Verify that client gets session ID when onStop() method is called.
      */
     @Test
     public void testClientGetSessionIdOnStop() throws Exception {
@@ -631,7 +631,7 @@ public class WifiScoreReportTest extends WifiBaseTest {
         mWifiScoreReport.setWifiConnectedNetworkScorer(mAppBinder, mWifiConnectedNetworkScorer);
         mWifiScoreReport.startConnectedNetworkScorer(TEST_SESSION_ID);
         mWifiScoreReport.stopConnectedNetworkScorer();
-        verify(mWifiConnectedNetworkScorer).stop(stopId.capture());
+        verify(mWifiConnectedNetworkScorer).onStop(stopId.capture());
         assertEquals((int) stopId.getValue(), TEST_SESSION_ID);
     }
 
@@ -648,7 +648,7 @@ public class WifiScoreReportTest extends WifiBaseTest {
     }
 
     /**
-     * Verify that WifiScoreReport gets updated score when onScoreChange() is called by apps.
+     * Verify that WifiScoreReport gets updated score when notifyScoreUpdate() is called by apps.
      */
     @Test
     public void testFrameworkGetsUpdatesScore() throws Exception {
@@ -660,19 +660,19 @@ public class WifiScoreReportTest extends WifiBaseTest {
         assertEquals(TEST_SESSION_ID, scorerImpl.mSessionId);
 
         // Invalid session ID
-        scorerImpl.mScoreChangeCallback.onScoreChange(-1, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(-1, 49);
         assertEquals(mWifiScoreReport.getScore(), ConnectedScore.WIFI_MAX_SCORE);
 
         // Incorrect session ID
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId + 10, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId + 10, 49);
         assertEquals(mWifiScoreReport.getScore(), ConnectedScore.WIFI_MAX_SCORE);
 
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         verify(mNetworkAgent).sendNetworkScore(49);
         assertEquals(mWifiScoreReport.getScore(), 49);
 
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 59);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 59);
         mLooper.dispatchAll();
         verify(mNetworkAgent).sendNetworkScore(59);
         assertEquals(mWifiScoreReport.getScore(), 59);
@@ -689,7 +689,7 @@ public class WifiScoreReportTest extends WifiBaseTest {
         mWifiScoreReport.setInterfaceName("wlan0");
         mWifiScoreReport.startConnectedNetworkScorer(TEST_SESSION_ID);
 
-        scorerImpl.mScoreChangeCallback.onTriggerUpdateOfWifiUsabilityStats(scorerImpl.mSessionId);
+        scorerImpl.mScoreUpdateObserver.triggerUpdateOfWifiUsabilityStats(scorerImpl.mSessionId);
         mLooper.dispatchAll();
         verify(mWifiNative).getWifiLinkLayerStats("wlan0");
         verify(mWifiNative).signalPoll("wlan0");
@@ -707,18 +707,18 @@ public class WifiScoreReportTest extends WifiBaseTest {
         mClock.mStepMillis = 0;
 
         mClock.mWallClockMillis = 5001;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         assertTrue(mWifiScoreReport.shouldCheckIpLayer());
         mWifiScoreReport.noteIpCheck();
 
         mClock.mWallClockMillis = 10000;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         assertFalse(mWifiScoreReport.shouldCheckIpLayer());
 
         mClock.mWallClockMillis = 10001;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         assertTrue(mWifiScoreReport.shouldCheckIpLayer());
     }
@@ -736,10 +736,10 @@ public class WifiScoreReportTest extends WifiBaseTest {
         mClock.mStepMillis = 0;
 
         mClock.mWallClockMillis = 10;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         mClock.mWallClockMillis = 29009;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         mWifiScoreReport.stopConnectedNetworkScorer();
         mLooper.dispatchAll();
@@ -759,10 +759,10 @@ public class WifiScoreReportTest extends WifiBaseTest {
         mClock.mStepMillis = 0;
 
         mClock.mWallClockMillis = 10;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         mClock.mWallClockMillis = 29011;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         mWifiScoreReport.stopConnectedNetworkScorer();
         mLooper.dispatchAll();
@@ -781,13 +781,13 @@ public class WifiScoreReportTest extends WifiBaseTest {
         mClock.mStepMillis = 0;
 
         mClock.mWallClockMillis = 10;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         mClock.mWallClockMillis = 15000;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 51);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 51);
         mLooper.dispatchAll();
         mClock.mWallClockMillis = 29011;
-        scorerImpl.mScoreChangeCallback.onScoreChange(scorerImpl.mSessionId, 49);
+        scorerImpl.mScoreUpdateObserver.notifyScoreUpdate(scorerImpl.mSessionId, 49);
         mLooper.dispatchAll();
         mWifiScoreReport.stopConnectedNetworkScorer();
         mLooper.dispatchAll();