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

Commit fc3c0a05 authored Aug 16, 2016 by Etan Cohen Committed by Mitchell Wills Aug 29, 2016

[NAN] Fix bad merge use rethrowFromSystemServer

Added 'throw' to the 'e.rethrowXXX()'. Not needed but seems
to be the accepted style.

Change-Id: I75e42d68ee6092699a55e26ee05151373139606d
(cherry picked from commit cb34ec8f)

parent 07e317c3

wifi/java/android/net/wifi/nan/WifiNanManager.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ public class WifiNanManager {
		try {
		mService.enableUsage();
		} catch (RemoteException e) {
		e.rethrowAsRuntimeException();
		throw e.rethrowFromSystemServer();
		}
		}

		@@ -272,7 +272,7 @@ public class WifiNanManager {
		try {
		mService.disableUsage();
		} catch (RemoteException e) {
		e.rethrowAsRuntimeException();
		throw e.rethrowFromSystemServer();
		}
		}

		@@ -286,10 +286,8 @@ public class WifiNanManager {
		try {
		return mService.isUsageEnabled();
		} catch (RemoteException e) {
		e.rethrowAsRuntimeException();
		throw e.rethrowFromSystemServer();
		}

		return false;
		}

		/**
		@@ -578,7 +576,7 @@ public class WifiNanManager {
		rangingKey = mService.startRanging(clientId, sessionId,
		new RttManager.ParcelableRttParams(params));
		} catch (RemoteException e) {
		e.rethrowAsRuntimeException();
		throw e.rethrowFromSystemServer();
		}

		synchronized (mLock) {