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

Commit d8288fe3 authored Oct 29, 2020 by Treehugger Robot Committed by Gerrit Code Review Oct 29, 2020

Merge "Replace hidden NMS permission control API"

parents bff73060 6513fcdc

core/java/android/os/INetworkManagementService.aidl

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -347,13 +347,6 @@ interface INetworkManagementService

	void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid);		void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid);

	/**
	* Set permission for a network.
	* @param permission PERMISSION_NONE to clear permissions.
	* PERMISSION_NETWORK or PERMISSION_SYSTEM to set permission.
	*/
	void setNetworkPermission(int netId, int permission);

	/**		/**
	* Allow UID to call protect().		* Allow UID to call protect().
	*/		*/

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -6256,9 +6256,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
	final int newPermission = getNetworkPermission(newNc);		final int newPermission = getNetworkPermission(newNc);
	if (oldPermission != newPermission && nai.created && !nai.isVPN()) {		if (oldPermission != newPermission && nai.created && !nai.isVPN()) {
	try {		try {
	mNMS.setNetworkPermission(nai.network.netId, newPermission);		mNetd.networkSetPermissionForNetwork(nai.network.netId, newPermission);
	} catch (RemoteException e) {		} catch (RemoteException \| ServiceSpecificException e) {
	loge("Exception in setNetworkPermission: " + e);		loge("Exception in networkSetPermissionForNetwork: " + e);
	}		}
	}		}
	}		}

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

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2008,17 +2008,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
	}		}
	}		}

	@Override
	public void setNetworkPermission(int netId, int permission) {
	NetworkStack.checkNetworkStackPermission(mContext);

	try {
	mNetdService.networkSetPermissionForNetwork(netId, permission);
	} catch (RemoteException \| ServiceSpecificException e) {
	throw new IllegalStateException(e);
	}
	}

	@Override		@Override
	public void allowProtect(int uid) {		public void allowProtect(int uid) {
	NetworkStack.checkNetworkStackPermission(mContext);		NetworkStack.checkNetworkStackPermission(mContext);