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

Commit be260381 authored by Roshan Pius's avatar Roshan Pius
Browse files

WifiP2pManager: Plumb package name to service 

Will be used for prioritization of different ifaces in HDM.

Bug: 162344695
Test: atest com.android.server.wifi
Change-Id: Iac1447390f7329768b9c307b08d28ebbd4ea3b90
parent dee80061

wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.os.Messenger; 
 */

interface IWifiP2pManager

{

    Messenger getMessenger(in IBinder binder);

    Messenger getMessenger(in IBinder binder, in String packageName);

    Messenger getP2pStateMachineMessenger();

    oneway void close(in IBinder binder);

    void setMiracastMode(int mode);

wifi/java/android/net/wifi/p2p/WifiP2pManager.java

+15 −10
Original line number Diff line number Diff line
@@ -1156,8 +1156,8 @@ public class WifiP2pManager { 
     */

    public Channel initialize(Context srcContext, Looper srcLooper, ChannelListener listener) {

        Binder binder = new Binder();

        Channel channel = initalizeChannel(srcContext, srcLooper, listener, getMessenger(binder),

                binder);

        Channel channel = initializeChannel(srcContext, srcLooper, listener,

                getMessenger(binder, srcContext.getOpPackageName()), binder);

        return channel;

    }
@@ -1167,12 +1167,12 @@ public class WifiP2pManager { 
     */

    public Channel initializeInternal(Context srcContext, Looper srcLooper,

                                      ChannelListener listener) {

        return initalizeChannel(srcContext, srcLooper, listener, getP2pStateMachineMessenger(),

        return initializeChannel(srcContext, srcLooper, listener, getP2pStateMachineMessenger(),

                null);

    }



    private Channel initalizeChannel(Context srcContext, Looper srcLooper, ChannelListener listener,

                                     Messenger messenger, Binder binder) {

    private Channel initializeChannel(Context srcContext, Looper srcLooper,

            ChannelListener listener, Messenger messenger, Binder binder) {

        if (messenger == null) return null;



        Channel c = new Channel(srcContext, srcLooper, listener, binder, this);
@@ -1814,6 +1814,14 @@ public class WifiP2pManager { 
        }

    }



    private Messenger getMessenger(@NonNull Binder binder, @Nullable String packageName) {

        try {

            return mService.getMessenger(binder, packageName);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Get a reference to WifiP2pService handler. This is used to establish

     * an AsyncChannel communication with WifiService
@@ -1824,11 +1832,8 @@ public class WifiP2pManager { 
     * @hide

     */

    public Messenger getMessenger(Binder binder) {

        try {

            return mService.getMessenger(binder);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        // No way to determine package name in this case.

        return getMessenger(binder, null);

    }



    /**