Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 899d3b69 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Extension API: Replace NetworkScore object with integer in API surface"... 

Merge "Extension API: Replace NetworkScore object with integer in API surface" into rvc-dev am: 3b117214 am: 6d55b94a

Change-Id: I293ee12c5ddfb6088de877c399981e0eab5f6a59
parents 2f08e911 6d55b94a

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -7530,7 +7530,7 @@ package android.net.wifi { 
  }

  }

















  public static interface WifiManager.ScoreChangeCallback {







  public static interface WifiManager.ScoreChangeCallback {











    method public void onScoreChange(int, @NonNull android.net.NetworkScore);







    method public void onScoreChange(int, int);











    method public void onTriggerUpdateOfWifiUsabilityStats(int);







    method public void onTriggerUpdateOfWifiUsabilityStats(int);











  }







  }









































wifi/java/android/net/wifi/IScoreChangeCallback.aidl



+2
−4




























Original line number
Original line
Diff line number
Diff line








@@ -16,16 +16,14 @@





























package android.net.wifi;







package android.net.wifi;































import android.net.NetworkScore;





























/**







/**











 * Interface for Wi-Fi network score callback.







 * Interface for Wi-Fi score callback.











 *







 *











 * @hide







 * @hide











 */







 */











oneway interface IScoreChangeCallback







oneway interface IScoreChangeCallback











{







{











    void onScoreChange(int sessionId, in NetworkScore score);







    void onScoreChange(int sessionId, int score);































    void onTriggerUpdateOfWifiUsabilityStats(int sessionId);







    void onTriggerUpdateOfWifiUsabilityStats(int sessionId);











}






}
























wifi/java/android/net/wifi/WifiManager.java



+4
−6




























Original line number
Original line
Diff line number
Diff line








@@ -39,7 +39,6 @@ import android.net.ConnectivityManager;









import android.net.DhcpInfo;







import android.net.DhcpInfo;











import android.net.MacAddress;







import android.net.MacAddress;











import android.net.Network;







import android.net.Network;











import android.net.NetworkScore;














import android.net.NetworkStack;







import android.net.NetworkStack;











import android.net.wifi.hotspot2.IProvisioningCallback;







import android.net.wifi.hotspot2.IProvisioningCallback;











import android.net.wifi.hotspot2.OsuProvider;







import android.net.wifi.hotspot2.OsuProvider;










@@ -5994,11 +5993,10 @@ public class WifiManager {









         *







         *











         * @param sessionId The ID to indicate current Wi-Fi network connection obtained from







         * @param sessionId The ID to indicate current Wi-Fi network connection obtained from











         *                  {@link WifiConnectedNetworkScorer#start(int)}.







         *                  {@link WifiConnectedNetworkScorer#start(int)}.











         * @param score The {@link android.net.NetworkScore} object representing the







         * @param score The score representing link quality of current Wi-Fi network connection.











         *              characteristics of current Wi-Fi network. Populated by connected network







         *              Populated by connected network scorer in applications..











         *              scorer in applications.














         */







         */











        void onScoreChange(int sessionId, @NonNull NetworkScore score);







        void onScoreChange(int sessionId, int score);































        /**







        /**











         * Called by applications to trigger an update of {@link WifiUsabilityStatsEntry}.







         * Called by applications to trigger an update of {@link WifiUsabilityStatsEntry}.









@@ -6024,7 +6022,7 @@ public class WifiManager {









        }







        }































        @Override







        @Override











        public void onScoreChange(int sessionId, @NonNull NetworkScore score) {







        public void onScoreChange(int sessionId, int score) {











            try {







            try {











                mScoreChangeCallback.onScoreChange(sessionId, score);







                mScoreChangeCallback.onScoreChange(sessionId, score);











            } catch (RemoteException e) {







            } catch (RemoteException e) {