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

Commit 69369f33 authored by Luke Huang's avatar Luke Huang
Browse files

Clatd-related commands porting 

Test: runtest frameworks-net passes
Test: manual testing of clatd works
Change-Id: Ia7ee6721870f9fc8f1490e758198a01c452ebac6
parent b6b8516b

core/java/android/os/INetworkManagementService.aidl

+0 −5
Original line number Diff line number Diff line
@@ -371,11 +371,6 @@ interface INetworkManagementService 
     */

    void stopClatd(String interfaceName);



    /**

     * Determine whether the clatd (464xlat) service has been started on the given interface.

     */

    boolean isClatdStarted(String interfaceName);



    /**

     * Start listening for mobile activity state changes.

     */

services/core/java/com/android/server/NetworkManagementService.java

+6 −21
Original line number Diff line number Diff line
@@ -2307,9 +2307,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);



        try {

            mConnector.execute("clatd", "start", interfaceName);

        } catch (NativeDaemonConnectorException e) {

            throw e.rethrowAsParcelableException();

            mNetdService.clatdStart(interfaceName);

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }

    }
@@ -2318,25 +2318,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);



        try {

            mConnector.execute("clatd", "stop", interfaceName);

        } catch (NativeDaemonConnectorException e) {

            throw e.rethrowAsParcelableException();

        }

    }



    @Override

    public boolean isClatdStarted(String interfaceName) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);



        final NativeDaemonEvent event;

        try {

            event = mConnector.execute("clatd", "status", interfaceName);

        } catch (NativeDaemonConnectorException e) {

            throw e.rethrowAsParcelableException();

            mNetdService.clatdStop(interfaceName);

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }



        event.checkCode(ClatdStatusResult);

        return event.getMessage().endsWith("started");

    }



    @Override