Merge changes Id0ece760,I160b5a62,I8b7563d0 (3fbc4f38) · Commits · e / os / android_frameworks_base

core/java/android/hardware/location/ContextHubInfo.java

+1 −157

Original line number	Diff line number	Diff line
		@@ -48,8 +48,7 @@ public class ContextHubInfo {
		private MemoryRegion[] mMemoryRegions;

		/*
		* TODO(b/66965339): Deprecate this constructor and the setter methods, and mark private fields
		* as final when the ContextHubService JNI code is removed.
		* TODO(b/67734082): Deprecate this constructor and mark private fields as final.
		*/
		public ContextHubInfo() {
		}
		@@ -88,17 +87,6 @@ public class ContextHubInfo {
		return mMaxPacketLengthBytes;
		}

		/**
		* set the context hub unique identifer
		*
		* @param bytes - Maximum number of bytes per message
		*
		* @hide
		*/
		public void setMaxPacketLenBytes(int bytes) {
		mMaxPacketLengthBytes = bytes;
		}

		/**
		* get the context hub unique identifer
		*
		@@ -108,17 +96,6 @@ public class ContextHubInfo {
		return mId;
		}

		/**
		* set the context hub unique identifer
		*
		* @param id - unique system wide identifier for the hub
		*
		* @hide
		*/
		public void setId(int id) {
		mId = id;
		}

		/**
		* get a string as a hub name
		*
		@@ -128,17 +105,6 @@ public class ContextHubInfo {
		return mName;
		}

		/**
		* set a string as the hub name
		*
		* @param name - the name for the hub
		*
		* @hide
		*/
		public void setName(String name) {
		mName = name;
		}

		/**
		* get a string as the vendor name
		*
		@@ -148,17 +114,6 @@ public class ContextHubInfo {
		return mVendor;
		}

		/**
		* set a string as the vendor name
		*
		* @param vendor - a name for the vendor
		*
		* @hide
		*/
		public void setVendor(String vendor) {
		mVendor = vendor;
		}

		/**
		* get tool chain string
		*
		@@ -168,17 +123,6 @@ public class ContextHubInfo {
		return mToolchain;
		}

		/**
		* set tool chain string
		*
		* @param toolchain - description of the tool chain
		*
		* @hide
		*/
		public void setToolchain(String toolchain) {
		mToolchain = toolchain;
		}

		/**
		* get platform version
		*
		@@ -188,17 +132,6 @@ public class ContextHubInfo {
		return mPlatformVersion;
		}

		/**
		* set platform version
		*
		* @param platformVersion - platform version number
		*
		* @hide
		*/
		public void setPlatformVersion(int platformVersion) {
		mPlatformVersion = platformVersion;
		}

		/**
		* get static platform version number
		*
		@@ -208,15 +141,6 @@ public class ContextHubInfo {
		return (mChreApiMajorVersion << 24) \| (mChreApiMinorVersion << 16) \| (mChrePatchVersion);
		}

		/**
		* set platform software version
		*
		* @param staticSwVersion - platform static s/w version number
		*
		* @hide
		*/
		public void setStaticSwVersion(int staticSwVersion) {}

		/**
		* get the tool chain version
		*
		@@ -226,17 +150,6 @@ public class ContextHubInfo {
		return mToolchainVersion;
		}

		/**
		* set the tool chain version number
		*
		* @param toolchainVersion - tool chain version number
		*
		* @hide
		*/
		public void setToolchainVersion(int toolchainVersion) {
		mToolchainVersion = toolchainVersion;
		}

		/**
		* get the peak processing mips the hub can support
		*
		@@ -246,17 +159,6 @@ public class ContextHubInfo {
		return mPeakMips;
		}

		/**
		* set the peak mips that this hub can support
		*
		* @param peakMips - peak mips this hub can deliver
		*
		* @hide
		*/
		public void setPeakMips(float peakMips) {
		mPeakMips = peakMips;
		}

		/**
		* get the stopped power draw in milliwatts
		* This assumes that the hub enter a stopped state - which is
		@@ -270,17 +172,6 @@ public class ContextHubInfo {
		return mStoppedPowerDrawMw;
		}

		/**
		* Set the power consumed by the hub in stopped state
		*
		* @param stoppedPowerDrawMw - stopped power in milli watts
		*
		* @hide
		*/
		public void setStoppedPowerDrawMw(float stoppedPowerDrawMw) {
		mStoppedPowerDrawMw = stoppedPowerDrawMw;
		}

		/**
		* get the power draw of the hub in sleep mode. This assumes
		* that the hub supports a sleep mode in which the power draw is
		@@ -296,17 +187,6 @@ public class ContextHubInfo {
		return mSleepPowerDrawMw;
		}

		/**
		* Set the sleep power draw in milliwatts
		*
		* @param sleepPowerDrawMw - sleep power draw in milliwatts.
		*
		* @hide
		*/
		public void setSleepPowerDrawMw(float sleepPowerDrawMw) {
		mSleepPowerDrawMw = sleepPowerDrawMw;
		}

		/**
		* get the peak powe draw of the hub. This is the power consumed
		* by the hub at maximum load.
		@@ -317,18 +197,6 @@ public class ContextHubInfo {
		return mPeakPowerDrawMw;
		}

		/**
		* set the peak power draw of the hub
		*
		* @param peakPowerDrawMw - peak power draw of the hub in
		* milliwatts.
		*
		* @hide
		*/
		public void setPeakPowerDrawMw(float peakPowerDrawMw) {
		mPeakPowerDrawMw = peakPowerDrawMw;
		}

		/**
		* get the sensors supported by this hub
		*
		@@ -351,30 +219,6 @@ public class ContextHubInfo {
		return Arrays.copyOf(mMemoryRegions, mMemoryRegions.length);
		}

		/**
		* set the supported sensors on this hub
		*
		* @param supportedSensors - supported sensors on this hub
		*
		* @hide
		*/
		public void setSupportedSensors(int[] supportedSensors) {
		mSupportedSensors = Arrays.copyOf(supportedSensors, supportedSensors.length);
		}

		/**
		* set memory regions for this hub
		*
		* @param memoryRegions - memory regions information
		*
		* @see MemoryRegion
		*
		* @hide
		*/
		public void setMemoryRegions(MemoryRegion[] memoryRegions) {
		mMemoryRegions = Arrays.copyOf(memoryRegions, memoryRegions.length);
		}

		/**
		* @return the CHRE platform ID as defined in chre/version.h
		*

services/core/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		android.hardware.oemlock-V1.0-java \
		android.hardware.tetheroffload.control-V1.0-java \
		android.hardware.vibrator-V1.0-java \
		android.hardware.configstore-V1.0-java
		android.hardware.configstore-V1.0-java \
		android.hardware.contexthub-V1.0-java

		ifneq ($(INCREMENTAL_BUILDS),)
		LOCAL_PROGUARD_ENABLED := disabled

services/core/java/com/android/server/location/ContextHubService.java

+474 −79

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/location/ContextHubServiceTransaction.java

0 → 100644

+161 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.location;

		import android.hardware.location.ContextHubTransaction;
		import android.hardware.location.NanoAppState;

		import java.util.List;
		import java.util.concurrent.TimeUnit;

		/**
		* An abstract class representing transactions requested to the Context Hub Service.
		*
		* @hide
		*/
		/* package */ abstract class ContextHubServiceTransaction {
		private final int mTransactionId;
		@ContextHubTransaction.Type
		private final int mTransactionType;

		/*
		* true if the transaction has already completed, false otherwise
		*/
		private boolean mIsComplete = false;

		/* package */ ContextHubServiceTransaction(int id, int type) {
		mTransactionId = id;
		mTransactionType = type;
		}

		/**
		* Starts this transaction with a Context Hub.
		*
		* All instances of this class must implement this method by making an asynchronous request to
		* a hub.
		*
		* @return the synchronous error code of the transaction start
		*/
		/* package */
		abstract int onTransact();

		/**
		* A function to invoke when a transaction times out.
		*
		* All instances of this class must implement this method by reporting the timeout to the
		* client.
		*/
		/* package */
		abstract void onTimeout();

		/**
		* A function to invoke when the transaction completes.
		*
		* Only relevant for load, unload, enable, or disable transactions.
		*
		* @param result the result of the transaction
		*/
		/* package */ void onTransactionComplete(int result) {
		}

		/**
		* A function to invoke when a query transaction completes.
		*
		* Only relevant for query transactions.
		*
		* @param result the result of the query
		* @param nanoAppStateList the list of nanoapps given by the query response
		*/
		/* package */ void onQueryResponse(int result, List<NanoAppState> nanoAppStateList) {
		}

		/**
		* @return the ID of this transaction
		*/
		/* package */ int getTransactionId() {
		return mTransactionId;
		}

		/**
		* @return the type of this transaction
		* @see ContextHubTransaction.Type
		*/
		@ContextHubTransaction.Type
		/* package */ int getTransactionType() {
		return mTransactionType;
		}

		/**
		* Gets the timeout period as defined in IContexthub.hal
		*
		* @return the timeout of this transaction in the specified time unit
		*/
		/* package */ long getTimeout(TimeUnit unit) {
		switch (mTransactionType) {
		case ContextHubTransaction.TYPE_LOAD_NANOAPP:
		return unit.convert(30L, TimeUnit.SECONDS);
		case ContextHubTransaction.TYPE_UNLOAD_NANOAPP:
		case ContextHubTransaction.TYPE_ENABLE_NANOAPP:
		case ContextHubTransaction.TYPE_DISABLE_NANOAPP:
		case ContextHubTransaction.TYPE_QUERY_NANOAPPS:
		// Note: query timeout is not specified at the HAL
		default: /* fall through */
		return unit.convert(5L, TimeUnit.SECONDS);
		}
		}

		/**
		* Marks the transaction as complete.
		*
		* Should only be called as a result of a response from a Context Hub callback
		*/
		/* package */ void setComplete() {
		mIsComplete = true;
		}

		/**
		* @return true if the transaction has already completed, false otherwise
		*/
		/* package */ boolean isComplete() {
		return mIsComplete;
		}

		/**
		* @return the human-readable string of this transaction's type
		*/
		private String getTransactionTypeString() {
		switch (mTransactionType) {
		case ContextHubTransaction.TYPE_LOAD_NANOAPP:
		return "Load";
		case ContextHubTransaction.TYPE_UNLOAD_NANOAPP:
		return "Unload";
		case ContextHubTransaction.TYPE_ENABLE_NANOAPP:
		return "Enable";
		case ContextHubTransaction.TYPE_DISABLE_NANOAPP:
		return "Disable";
		case ContextHubTransaction.TYPE_QUERY_NANOAPPS:
		return "Query";
		default:
		return "Unknown";
		}
		}

		@Override
		public String toString() {
		return getTransactionTypeString() + " transaction (ID = " + mTransactionId + ")";
		}
		}

services/core/java/com/android/server/location/ContextHubServiceUtil.java

0 → 100644

+168 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.location;

		import android.hardware.contexthub.V1_0.ContextHub;
		import android.hardware.contexthub.V1_0.ContextHubMsg;
		import android.hardware.contexthub.V1_0.HostEndPoint;
		import android.hardware.contexthub.V1_0.HubAppInfo;
		import android.hardware.location.ContextHubInfo;
		import android.hardware.location.NanoAppBinary;
		import android.hardware.location.NanoAppMessage;
		import android.hardware.location.NanoAppState;
		import android.util.Log;

		import java.util.List;
		import java.util.ArrayList;

		/**
		* A class encapsulating helper functions used by the ContextHubService class
		*/
		/* package */ class ContextHubServiceUtil {
		private static final String TAG = "ContextHubServiceUtil";

		/**
		* Creates a ContextHubInfo array from an ArrayList of HIDL ContextHub objects.
		*
		* @param hubList the ContextHub ArrayList
		* @return the ContextHubInfo array
		*/
		/* package */
		static ContextHubInfo[] createContextHubInfoArray(List<ContextHub> hubList) {
		ContextHubInfo[] contextHubInfoList = new ContextHubInfo[hubList.size()];
		for (int i = 0; i < hubList.size(); i++) {
		contextHubInfoList[i] = new ContextHubInfo(hubList.get(i));
		}

		return contextHubInfoList;
		}

		/**
		* Copies a primitive byte array to a ArrayList<Byte>.
		*
		* @param inputArray the primitive byte array
		* @param outputArray the ArrayList<Byte> array to append
		*/
		/* package */
		static void copyToByteArrayList(byte[] inputArray, ArrayList<Byte> outputArray) {
		outputArray.clear();
		outputArray.ensureCapacity(inputArray.length);
		for (byte element : inputArray) {
		outputArray.add(element);
		}
		}

		/**
		* Creates a byte array given a ArrayList<Byte> and copies its contents.
		*
		* @param array the ArrayList<Byte> object
		* @return the byte array
		*/
		/* package */
		static byte[] createPrimitiveByteArray(ArrayList<Byte> array) {
		byte[] primitiveArray = new byte[array.size()];
		for (int i = 0; i < array.size(); i++) {
		primitiveArray[i] = array.get(i);
		}

		return primitiveArray;
		}

		/**
		* Generates the Context Hub HAL's NanoAppBinary object from the client-facing
		* android.hardware.location.NanoAppBinary object.
		*
		* @param nanoAppBinary the client-facing NanoAppBinary object
		* @return the Context Hub HAL's NanoAppBinary object
		*/
		/* package */
		static android.hardware.contexthub.V1_0.NanoAppBinary createHidlNanoAppBinary(
		NanoAppBinary nanoAppBinary) {
		android.hardware.contexthub.V1_0.NanoAppBinary hidlNanoAppBinary =
		new android.hardware.contexthub.V1_0.NanoAppBinary();

		hidlNanoAppBinary.appId = nanoAppBinary.getNanoAppId();
		hidlNanoAppBinary.appVersion = nanoAppBinary.getNanoAppVersion();
		hidlNanoAppBinary.flags = nanoAppBinary.getFlags();
		hidlNanoAppBinary.targetChreApiMajorVersion = nanoAppBinary.getTargetChreApiMajorVersion();
		hidlNanoAppBinary.targetChreApiMinorVersion = nanoAppBinary.getTargetChreApiMinorVersion();

		// Log exceptions while processing the binary, but continue to pass down the binary
		// since the error checking is deferred to the Context Hub.
		try {
		copyToByteArrayList(nanoAppBinary.getBinaryNoHeader(), hidlNanoAppBinary.customBinary);
		} catch (IndexOutOfBoundsException e) {
		Log.w(TAG, e.getMessage());
		} catch (NullPointerException e) {
		Log.w(TAG, "NanoApp binary was null");
		}

		return hidlNanoAppBinary;
		}

		/**
		* Generates a client-facing NanoAppState array from a HAL HubAppInfo array.
		*
		* @param nanoAppInfoList the array of HubAppInfo objects
		* @return the corresponding array of NanoAppState objects
		*/
		/* package */
		static List<NanoAppState> createNanoAppStateList(
		List<HubAppInfo> nanoAppInfoList) {
		ArrayList<NanoAppState> nanoAppStateList = new ArrayList<>();
		for (HubAppInfo appInfo : nanoAppInfoList) {
		nanoAppStateList.add(
		new NanoAppState(appInfo.appId, appInfo.version, appInfo.enabled));
		}

		return nanoAppStateList;
		}

		/**
		* Creates a HIDL ContextHubMsg object to send to a nanoapp.
		*
		* @param hostEndPoint the ID of the client sending the message
		* @param message the client-facing NanoAppMessage object describing the message
		* @return the HIDL ContextHubMsg object
		*/
		/* package */
		static ContextHubMsg createHidlContextHubMessage(short hostEndPoint, NanoAppMessage message) {
		ContextHubMsg hidlMessage = new ContextHubMsg();

		hidlMessage.appName = message.getNanoAppId();
		hidlMessage.hostEndPoint = hostEndPoint;
		hidlMessage.msgType = message.getMessageType();
		copyToByteArrayList(message.getMessageBody(), hidlMessage.msg);

		return hidlMessage;
		}

		/**
		* Creates a client-facing NanoAppMessage object to send to a client.
		*
		* @param message the HIDL ContextHubMsg object from a nanoapp
		* @return the NanoAppMessage object
		*/
		/* package */
		static NanoAppMessage createNanoAppMessage(ContextHubMsg message) {
		byte[] messageArray = createPrimitiveByteArray(message.msg);

		return NanoAppMessage.createMessageFromNanoApp(
		message.appName, message.msgType, messageArray,
		message.hostEndPoint == HostEndPoint.BROADCAST);
		}
		}