06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Tue, 11 Feb 2020 17:07:00 +0000
|
|
Subject: Bug 1578073 - Remove native calls in Histogram.java; r=ng
|
|
|
|
Getting the JNI calls here to work requires a good amount of webrtc.org
|
|
machinery. It might be worth setting that up the next time we do an upstream
|
|
merge, but for now, it is a lot simpler to just remove the affected code,
|
|
given that we are not interested in collecting this data anyway.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D61860
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/7a9b07dec9f9d435416b06829fa5063aca3a476e
|
|
---
|
|
sdk/android/src/java/org/webrtc/Histogram.java | 9 ++-------
|
|
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/sdk/android/src/java/org/webrtc/Histogram.java b/sdk/android/src/java/org/webrtc/Histogram.java
|
|
index 877986134a..c1d2d61a71 100644
|
|
--- a/sdk/android/src/java/org/webrtc/Histogram.java
|
|
+++ b/sdk/android/src/java/org/webrtc/Histogram.java
|
|
@@ -27,18 +27,13 @@ class Histogram {
|
|
}
|
|
|
|
static public Histogram createCounts(String name, int min, int max, int bucketCount) {
|
|
- return new Histogram(nativeCreateCounts(name, min, max, bucketCount));
|
|
+ return new Histogram(0);
|
|
}
|
|
|
|
static public Histogram createEnumeration(String name, int max) {
|
|
- return new Histogram(nativeCreateEnumeration(name, max));
|
|
+ return new Histogram(0);
|
|
}
|
|
|
|
public void addSample(int sample) {
|
|
- nativeAddSample(handle, sample);
|
|
}
|
|
-
|
|
- private static native long nativeCreateCounts(String name, int min, int max, int bucketCount);
|
|
- private static native long nativeCreateEnumeration(String name, int max);
|
|
- private static native void nativeAddSample(long handle, int sample);
|
|
}
|