Fix lint errors

pull/18/head
Mattia Iavarone 8 years ago
parent bea56a37d3
commit fc8bb4208f
  1. 3
      .travis.yml
  2. 6
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java

@ -26,10 +26,11 @@ android:
# Android tests # Android tests
- android-$EMULATOR_API - android-$EMULATOR_API
- sys-img-$EMULATOR_ABI-android-$EMULATOR_API - sys-img-$EMULATOR_ABI-android-$EMULATOR_API
# sys-img-x86-google_apis-26
before_script: before_script:
- echo no | android create avd --force --name test --target android-$EMULATOR_API --abi $EMULATOR_ABI - echo no | android create avd --force --name test --target android-$EMULATOR_API --abi $EMULATOR_ABI
- emulator -avd test -no-skin -no-audio -no-window & - emulator -avd test -no-audio -no-window &
- android-wait-for-emulator - android-wait-for-emulator
- adb shell input keyevent 82 & - adb shell input keyevent 82 &

@ -1,6 +1,7 @@
package com.otaliastudios.cameraview; package com.otaliastudios.cameraview;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@ -496,6 +497,7 @@ public class CameraView extends FrameLayout {
* Throws if session = audio and manifest did not add the microphone permissions. * Throws if session = audio and manifest did not add the microphone permissions.
* @return true if we can go on, false otherwise. * @return true if we can go on, false otherwise.
*/ */
@SuppressLint("NewApi")
private boolean checkPermissions(SessionType sessionType) { private boolean checkPermissions(SessionType sessionType) {
checkPermissionsManifestOrThrow(sessionType); checkPermissionsManifestOrThrow(sessionType);
boolean api23 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; boolean api23 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
@ -504,9 +506,7 @@ public class CameraView extends FrameLayout {
cameraCheck = PackageManager.PERMISSION_GRANTED; cameraCheck = PackageManager.PERMISSION_GRANTED;
audioCheck = PackageManager.PERMISSION_GRANTED; audioCheck = PackageManager.PERMISSION_GRANTED;
} else { } else {
//noinspection all
cameraCheck = getContext().checkSelfPermission(Manifest.permission.CAMERA); cameraCheck = getContext().checkSelfPermission(Manifest.permission.CAMERA);
//noinspection all
audioCheck = getContext().checkSelfPermission(Manifest.permission.RECORD_AUDIO); audioCheck = getContext().checkSelfPermission(Manifest.permission.RECORD_AUDIO);
} }
switch (sessionType) { switch (sessionType) {
@ -1202,7 +1202,7 @@ public class CameraView extends FrameLayout {
private MediaActionSound mSound; private MediaActionSound mSound;
private final boolean mUseSounds = Build.VERSION.SDK_INT >= 16; private final boolean mUseSounds = Build.VERSION.SDK_INT >= 16;
@SuppressWarnings("all") @SuppressLint("NewApi")
private void sound(int soundType) { private void sound(int soundType) {
if (mUseSounds) { if (mUseSounds) {
if (mSound == null) mSound = new MediaActionSound(); if (mSound == null) mSound = new MediaActionSound();

Loading…
Cancel
Save