Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Trax
traxcam
Commits
ca804ba3
Commit
ca804ba3
authored
4 years ago
by
Mark Harman
Browse files
Options
Download
Email Patches
Plain Diff
Fix/ignore Android warnings.
parent
4b11b8f6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java
...ava/net/sourceforge/opencamera/test/MainActivityTest.java
+2
-0
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+2
-1
app/src/main/java/net/sourceforge/opencamera/ImageSaver.java
app/src/main/java/net/sourceforge/opencamera/ImageSaver.java
+2
-0
app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController2.java
...eforge/opencamera/cameracontroller/CameraController2.java
+1
-1
No files found.
app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java
View file @
ca804ba3
...
...
@@ -74,6 +74,8 @@ import android.widget.SeekBar;
import android.widget.TextView;
import android.widget.ZoomControls;
// ignore warning about "Call to Thread.sleep in a loop", this is only test code
@SuppressWarnings("BusyWait")
public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> {
private static final String TAG = "MainActivityTest";
private MainActivity mActivity = null;
...
...
This diff is collapsed.
Click to expand it.
app/src/main/AndroidManifest.xml
View file @
ca804ba3
...
...
@@ -13,7 +13,8 @@
<uses-permission
android:name=
"android.permission.BLUETOOTH"
/>
<uses-permission
android:name=
"android.permission.BLUETOOTH_ADMIN"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion=
"28"
/>
android:maxSdkVersion=
"28"
tools:ignore=
"ScopedStorage"
/>
<uses-permission
android:name=
"android.permission.CAMERA"
/>
<uses-permission
android:name=
"android.permission.RECORD_AUDIO"
/>
<uses-permission
android:name=
"android.permission.ACCESS_FINE_LOCATION"
/>
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/net/sourceforge/opencamera/ImageSaver.java
View file @
ca804ba3
...
...
@@ -505,6 +505,8 @@ public class ImageSaver extends Thread {
break
;
}
if
(
test_slow_saving
)
{
// ignore warning about "Call to Thread.sleep in a loop", this is only activated in test code
//noinspection BusyWait
Thread
.
sleep
(
2000
);
}
if
(
MyDebug
.
LOG
)
{
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController2.java
View file @
ca804ba3
...
...
@@ -63,7 +63,7 @@ public class CameraController2 extends CameraController {
private
final
Context
context
;
private
CameraDevice
camera
;
private
String
cameraIdS
;
private
final
String
cameraIdS
;
private
final
boolean
is_samsung
;
private
final
boolean
is_samsung_s7
;
// Galaxy S7 or Galaxy S7 Edge
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment