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
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Wed, 12 Feb 2020 17:19:00 +0000
|
|
Subject: Bug 1578073 - Suppress MissingPermission lint in Camera2Session;
|
|
r=snorp
|
|
|
|
Depends on D61861
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D62457
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/722c4a6d1dad867f9ce47fe96d71b5dedb4cbaa8
|
|
---
|
|
sdk/android/src/java/org/webrtc/Camera2Session.java | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/sdk/android/src/java/org/webrtc/Camera2Session.java b/sdk/android/src/java/org/webrtc/Camera2Session.java
|
|
index dec97a2c25..d5ee80c73e 100644
|
|
--- a/sdk/android/src/java/org/webrtc/Camera2Session.java
|
|
+++ b/sdk/android/src/java/org/webrtc/Camera2Session.java
|
|
@@ -10,6 +10,7 @@
|
|
|
|
package org.webrtc;
|
|
|
|
+import android.annotation.SuppressLint;
|
|
import android.content.Context;
|
|
import android.hardware.camera2.CameraAccessException;
|
|
import android.hardware.camera2.CameraCaptureSession;
|
|
@@ -347,6 +348,7 @@ class Camera2Session implements CameraSession {
|
|
Logging.d(TAG, "Using capture format: " + captureFormat);
|
|
}
|
|
|
|
+ @SuppressLint("MissingPermission")
|
|
private void openCamera() {
|
|
checkIsOnCameraThread();
|
|
|