Reland of Combine webrtc/api/java/android and webrtc/api/java/src. (patchset #1 id:1 of https://codereview.webrtc.org/2106333005/ )
Reason for revert:
Issues fixed
Original issue's description:
> Revert of Combine webrtc/api/java/android and webrtc/api/java/src. (patchset #1 id:1 of https://codereview.webrtc.org/2111823002/ )
>
> Reason for revert:
> Breaks downstream dependencies
>
> Original issue's description:
> > Combine webrtc/api/java/android and webrtc/api/java/src.
> >
> > It used to be that there was a Java api for devices not running Android
> > but that is no longer the case. I combined the directories and made
> > the folder structure chromium style.
> >
> > BUG=webrtc:6067
> > R=magjed@webrtc.org, tommi@webrtc.org
> >
> > Committed: https://chromium.googlesource.com/external/webrtc/+/ceefe20dd65387d83059d9fc1ce84842650ed5e2
>
> TBR=magjed@webrtc.org,tommi@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6067
>
> Committed: https://chromium.googlesource.com/external/webrtc/+/9b0dc622d46b6b09bb7ccaca6b2f68739c87ff8d
TBR=magjed@webrtc.org,tommi@webrtc.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6067
Review-Url: https://codereview.webrtc.org/2111923003
Cr-Commit-Position: refs/heads/master@{#13363}
diff --git a/webrtc/api/android/jni/androidmetrics_jni.cc b/webrtc/api/android/jni/androidmetrics_jni.cc
new file mode 100644
index 0000000..6e658c8
--- /dev/null
+++ b/webrtc/api/android/jni/androidmetrics_jni.cc
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <map>
+#include <memory>
+
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
+#include "webrtc/system_wrappers/include/metrics_default.h"
+
+// Enables collection of native histograms.
+namespace webrtc_jni {
+JOW(void, Metrics_nativeEnable)(JNIEnv* jni, jclass) {
+ webrtc::metrics::Enable();
+}
+
+// Gets and clears native histograms.
+JOW(jobject, Metrics_nativeGetAndReset)(JNIEnv* jni, jclass) {
+ jclass j_metrics_class = FindClass(jni, "org/webrtc/Metrics");
+ jmethodID j_add =
+ GetMethodID(jni, j_metrics_class, "add",
+ "(Ljava/lang/String;Lorg/webrtc/Metrics$HistogramInfo;)V");
+ jclass j_info_class = FindClass(jni, "org/webrtc/Metrics$HistogramInfo");
+ jmethodID j_add_sample = GetMethodID(jni, j_info_class, "addSample", "(II)V");
+
+ // Create |Metrics|.
+ jobject j_metrics = jni->NewObject(
+ j_metrics_class, GetMethodID(jni, j_metrics_class, "<init>", "()V"));
+
+ std::map<std::string, std::unique_ptr<webrtc::metrics::SampleInfo>>
+ histograms;
+ webrtc::metrics::GetAndReset(&histograms);
+ for (const auto& kv : histograms) {
+ // Create and add samples to |HistogramInfo|.
+ jobject j_info = jni->NewObject(
+ j_info_class, GetMethodID(jni, j_info_class, "<init>", "(III)V"),
+ kv.second->min, kv.second->max,
+ static_cast<int>(kv.second->bucket_count));
+ for (const auto& sample : kv.second->samples) {
+ jni->CallVoidMethod(j_info, j_add_sample, sample.first, sample.second);
+ }
+ // Add |HistogramInfo| to |Metrics|.
+ jstring j_name = jni->NewStringUTF(kv.first.c_str());
+ jni->CallVoidMethod(j_metrics, j_add, j_name, j_info);
+ jni->DeleteLocalRef(j_name);
+ jni->DeleteLocalRef(j_info);
+ }
+ CHECK_EXCEPTION(jni);
+ return j_metrics;
+}
+} // namespace webrtc_jni