Merge "Remove unused method from NetworkManagementService" (70c3000a) · Commits · e / os / android_frameworks_base

core/java/android/os/INetworkManagementService.aidl

+0 −5

Original line number	Diff line number	Diff line
		@@ -232,11 +232,6 @@ interface INetworkManagementService
		*/
		void stopAccessPoint(String iface);

		/**
		* Set Access Point config
		*/
		void setAccessPoint(in WifiConfiguration wifiConfig, String iface);

		/**
		** DATA USAGE RELATED
		**/

+0 −23

Original line number	Diff line number	Diff line
		@@ -1538,29 +1538,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		}
		}

		@Override
		public void setAccessPoint(WifiConfiguration wifiConfig, String wlanIface) {
		mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
		Object[] args;
		String logMsg = "startAccessPoint Error setting up softap";
		try {
		if (wifiConfig == null) {
		args = new Object[] {"set", wlanIface};
		} else {
		// TODO: understand why this is set to "6" instead of
		// Integer.toString(wifiConfig.apChannel) as in startAccessPoint
		// TODO: should startAccessPoint call this instead of repeating code?
		args = new Object[] {"set", wlanIface, wifiConfig.SSID,
		"broadcast", "6",
		getSecurityType(wifiConfig), new SensitiveArg(wifiConfig.preSharedKey)};
		}
		executeOrLogWithMessage(SOFT_AP_COMMAND, args, NetdResponseCode.SoftapStatusResult,
		SOFT_AP_COMMAND_SUCCESS, logMsg);
		} catch (NativeDaemonConnectorException e) {
		throw e.rethrowAsParcelableException();
		}
		}

		@Override
		public void addIdleTimer(String iface, int timeout, final int type) {
		mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);