Merge changes Id0ece760,I160b5a62,I8b7563d0

* changes:
  Creates utility functions to convert between messages
  Removes setters from ContextHubInfo
  Replace JNI code with Java HIDL at ContextHubService

1 files changed, 1 insertions, 157 deletions

diff --git a/core/java/android/hardware/location/ContextHubInfo.java b/core/java/android/hardware/location/ContextHubInfo.java
index 7fc783611c68..e1137aa51348 100644
--- a/core/java/android/hardware/location/ContextHubInfo.java
+++ b/core/java/android/hardware/location/ContextHubInfo.java
@@ -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() {
     }
@@ -89,17 +88,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      *
      * @return int - unique system wide identifier
@@ -109,17 +97,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      *
      * @return String - a name for the hub
@@ -129,17 +106,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      *
      * @return String - a name for the vendor
@@ -149,17 +115,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      *
      * @return String - description of the tool chain
@@ -169,17 +124,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * set tool chain string
-     *
-     * @param toolchain - description of the tool chain
-     *
-     * @hide
-     */
-    public void setToolchain(String toolchain) {
-        mToolchain = toolchain;
-    }
-
-    /**
      * get platform version
      *
      * @return int - platform version number
@@ -189,17 +133,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * set platform version
-     *
-     * @param platformVersion - platform version number
-     *
-     * @hide
-     */
-    public void setPlatformVersion(int platformVersion) {
-        mPlatformVersion = platformVersion;
-    }
-
-    /**
      * get static platform version number
      *
      * @return int - platform version number
@@ -209,15 +142,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * set platform software version
-     *
-     * @param staticSwVersion - platform static s/w version number
-     *
-     * @hide
-     */
-    public void setStaticSwVersion(int staticSwVersion) {}
-
-    /**
      * get the tool chain version
      *
      * @return int - the tool chain version
@@ -227,17 +151,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      *
      * @return float - peak MIPS that this hub can deliver
@@ -247,17 +160,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      * different from the sleep state. Latencies on exiting the
@@ -271,17 +173,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      * lower than the power consumed when the hub is actively
@@ -297,17 +188,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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.
      *
@@ -318,18 +198,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      *
      * @return int[] - all the supported sensors on this hub
@@ -352,30 +220,6 @@ public class ContextHubInfo {
     }
 
     /**
-     * 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
      *
      * TODO(b/67734082): Expose as public API