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

Commit 5cadf4f3 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "getConnectionInfo should take calling package name as argument" into oc-mr1-dev 

am: 54c6667b

Change-Id: Id7a0b7390a878b507e431be007ba2f2ce4f55e15
parents 7d7f68d4 54c6667b

wifi/java/android/net/wifi/IWifiManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ interface IWifiManager 


    void reassociate();



    WifiInfo getConnectionInfo();

    WifiInfo getConnectionInfo(String callingPackage);



    boolean setWifiEnabled(String packageName, boolean enable);

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

+1 −1
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ public class WifiManager { 
     */

    public WifiInfo getConnectionInfo() {

        try {

            return mService.getConnectionInfo();

            return mService.getConnectionInfo(mContext.getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }