[SVN] r2292 twister-lib-android in /Libraries/twister-lib-android/

[FIX] Ignore some warnings until better tooling support arrives
TWiStErRob · Mar 12, 2017 · de5bb5d · de5bb5d
1 parent 63a5425
commit de5bb5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/libs/twister-lib-android/lint.xml b/libs/twister-lib-android/lint.xml
@@ -8,6 +8,7 @@
 		<ignore regexp="R\.bool\.in_test" />
 		<!-- Not used, because this is a library, used by consuming apps -->
 		<ignore path="src/main/res/values/dimens.xml" />
+		<ignore path="src/main/res/values/consts.xml" />
 		<!-- Used by consuming applications -->
 		<ignore path="src/main/res/layout/inc_empty.xml" />
 		<ignore path="src/main/res/values/strings_about.xml" />

diff --git a/libs/twister-lib-android/src/main/java/net/twisterrob/android/activity/CaptureImage.java b/libs/twister-lib-android/src/main/java/net/twisterrob/android/activity/CaptureImage.java
@@ -6,7 +6,7 @@
 
 import android.Manifest;
 import android.animation.*;
-import android.annotation.TargetApi;
+import android.annotation.*;
 import android.app.Activity;
 import android.content.*;
 import android.content.pm.PackageManager;
@@ -55,6 +55,7 @@
  * > <a href="https://code.google.com/archive/p/ece301-examples/downloads">Downloads</a>
  * > <a href="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ece301-examples/CameraPreview.zip">CameraPreview.zip</a> (password preview).
  */
+@SuppressLint("WrongThread") // TODEL when updated the Gradle plugin with new lint
 @UiThread
 public class CaptureImage extends Activity implements ActivityCompat.OnRequestPermissionsResultCallback {
 	private static final Logger LOG = LoggerFactory.getLogger(CaptureImage.class);