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

Commit 361cea7d authored by Rubin Xu's avatar Rubin Xu
Browse files

Remove unused methods from INetworkManagementService 

Remove unused public methods setPermission() and clearPermission()

Bug: 114231106
Test: make

Change-Id: I7acbbd36f41bef1356a158bed075c7be330728f4
(cherry picked from commit a430eda4)
parent 5b5c8f67

core/java/android/os/INetworkManagementService.aidl

+0 −3
Original line number Diff line number Diff line
@@ -396,9 +396,6 @@ interface INetworkManagementService 
     */

    void setNetworkPermission(int netId, int permission);



    void setPermission(String permission, in int[] uids);

    void clearPermission(in int[] uids);



    /**

     * Allow UID to call protect().

     */

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

+0 −32
Original line number Diff line number Diff line
@@ -2149,38 +2149,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
        }

    }



    private int parsePermission(String permission) {

        if (permission.equals("NETWORK")) {

            return INetd.PERMISSION_NETWORK;

        }

        if (permission.equals("SYSTEM")) {

            return INetd.PERMISSION_SYSTEM;

        }

        return INetd.PERMISSION_NONE;

    }



    @Override

    public void setPermission(String permission, int[] uids) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);



        try {

            mNetdService.networkSetPermissionForUser(parsePermission(permission), uids);

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }

    }



    @Override

    public void clearPermission(int[] uids) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);



        try {

            mNetdService.networkClearPermissionForUser(uids);

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }

    }



    @Override

    public void allowProtect(int uid) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);