Implements disableNanoApp (54e1a89c) · Commits · e / os / android_frameworks_base

core/java/android/hardware/location/ContextHubManager.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -417,7 +417,17 @@ public final class ContextHubManager {
		*/
		@RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)
		public ContextHubTransaction<Void> disableNanoApp(ContextHubInfo hubInfo, long nanoAppId) {
		throw new UnsupportedOperationException("TODO: Implement this");
		ContextHubTransaction<Void> transaction =
		new ContextHubTransaction<>(ContextHubTransaction.TYPE_DISABLE_NANOAPP);
		IContextHubTransactionCallback callback = createTransactionCallback(transaction);

		try {
		mService.disableNanoApp(hubInfo.getId(), callback, nanoAppId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

		return transaction;
		}

		/**

+5 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,11 @@ interface IContextHubService {
		int contextHubId, in IContextHubTransactionCallback transactionCallback,
		long nanoAppId);

		// Disables a nanoapp at the specified hub
		void disableNanoApp(
		int contextHubId, in IContextHubTransactionCallback transactionCallback,
		long nanoAppId);

		// Queries for a list of nanoapps
		void queryNanoApps(int contextHubId, in IContextHubTransactionCallback transactionCallback);
		}

+24 −0

Original line number	Diff line number	Diff line
		@@ -717,6 +717,30 @@ public class ContextHubService extends IContextHubService.Stub {
		mTransactionManager.addTransaction(transaction);
		}

		/**
		* Disables a nanoapp at the specified Context Hub.
		*
		* @param contextHubId the ID of the hub to disable the nanoapp
		* @param transactionCallback the client-facing transaction callback interface
		* @param nanoAppId the ID of the nanoapp to disable
		*
		* @throws IllegalStateException if the transaction queue is full
		*/
		@Override
		public void disableNanoApp(
		int contextHubId, IContextHubTransactionCallback transactionCallback, long nanoAppId)
		throws RemoteException {
		checkPermissions();
		if (!checkHalProxyAndContextHubId(
		contextHubId, transactionCallback, ContextHubTransaction.TYPE_DISABLE_NANOAPP)) {
		return;
		}

		ContextHubServiceTransaction transaction = mTransactionManager.createDisableTransaction(
		contextHubId, nanoAppId, transactionCallback);
		mTransactionManager.addTransaction(transaction);
		}

		/**
		* Queries for a list of nanoapps from the specified Context hub.
		*

+35 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,41 @@ import java.util.concurrent.atomic.AtomicInteger;
		};
		}

		/**
		* Creates a transaction for disabling a nanoapp.
		*
		* @param contextHubId the ID of the hub to disable the nanoapp on
		* @param nanoAppId the ID of the nanoapp to disable
		* @param onCompleteCallback the client on complete callback
		* @return the generated transaction
		*/
		/* package */ ContextHubServiceTransaction createDisableTransaction(
		int contextHubId, long nanoAppId, IContextHubTransactionCallback onCompleteCallback) {
		return new ContextHubServiceTransaction(
		mNextAvailableId.getAndIncrement(), ContextHubTransaction.TYPE_DISABLE_NANOAPP) {
		@Override
		/* package */ int onTransact() {
		try {
		return mContextHubProxy.disableNanoApp(
		contextHubId, nanoAppId, this.getTransactionId());
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException while trying to disable nanoapp with ID 0x" +
		Long.toHexString(nanoAppId), e);
		return Result.UNKNOWN_FAILURE;
		}
		}

		@Override
		/* package */ void onTransactionComplete(@ContextHubTransaction.Result int result) {
		try {
		onCompleteCallback.onTransactionComplete(result);
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException while calling client onTransactionComplete", e);
		}
		}
		};
		}

		/**
		* Creates a transaction for querying for a list of nanoapps.
		*