commit e616f790e5f015e435405eae479d82d93dcdc606
author Tobias Thierer <tobiast@google.com> Fri Apr 22 15:33:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 22 15:33:20 2016 +0000
tree 8940c6fa9536b15f4082237deae5a9fb5845dcda
parent 21c447cc652adebc7bf06c71344baa760fb58acb
parent a03759c9aea80d146b4874cd5023303c694214d2

Merge "frameworks/ml: Avoid allocations that are immediately unboxed." am: 1f0f8e1b40 am: 25b66df0c9
am: a03759c9ae

* commit 'a03759c9aea80d146b4874cd5023303c694214d2':
  frameworks/ml: Avoid allocations that are immediately unboxed.

Change-Id: Ifb5f7628cfc51047d186bb5ad14753cd834ad87a

bordeaux/service/src/android/bordeaux/services/ClusterManager.java

diff --git a/bordeaux/service/src/android/bordeaux/services/ClusterManager.java b/bordeaux/service/src/android/bordeaux/services/ClusterManager.java
index 4f0dd68..71e77a3 100644
--- a/bordeaux/service/src/android/bordeaux/services/ClusterManager.java
+++ b/bordeaux/service/src/android/bordeaux/services/ClusterManager.java
@@ -262,9 +262,9 @@
             mSemanticClusters.clear();
             for (Map<String, String> map : allData) {
                 String semanticId = map.get(SEMANTIC_ID);
-                double longitude = Double.valueOf(map.get(SEMANTIC_LONGITUDE));
-                double latitude = Double.valueOf(map.get(SEMANTIC_LATITUDE));
-                long duration = Long.valueOf(map.get(SEMANTIC_DURATION));
+                double longitude = Double.parseDouble(map.get(SEMANTIC_LONGITUDE));
+                double latitude = Double.parseDouble(map.get(SEMANTIC_LATITUDE));
+                long duration = Long.parseLong(map.get(SEMANTIC_DURATION));
                 BaseCluster cluster =
                     new BaseCluster(semanticId, longitude, latitude, duration);
 

bordeaux/service/src/android/bordeaux/services/Predictor.java

diff --git a/bordeaux/service/src/android/bordeaux/services/Predictor.java b/bordeaux/service/src/android/bordeaux/services/Predictor.java
index b3c0d45..9d9047a 100644
--- a/bordeaux/service/src/android/bordeaux/services/Predictor.java
+++ b/bordeaux/service/src/android/bordeaux/services/Predictor.java
@@ -147,7 +147,7 @@
             }
         } else if (key.equals(USE_HISTORY)) {
             mUseHistory = true;
-            mHistorySpan = Long.valueOf(value);
+            mHistorySpan = Long.parseLong(value);
         } else {
             Log.e(TAG,"Setting parameter " + key + " with " + value + " is not valid");
         }