diff options
| author | aurimas <aurimas@chromium.org> | 2015-10-19 16:17:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-19 23:18:13 +0000 |
| commit | 675d05bceb030ebbb8e3b2c112129984a106bd56 (patch) | |
| tree | b78b710eb0e2ea5fc2d4b80f79b7179d1e26c63e /media/base/android/java | |
| parent | a1f76e674086b9ab084fab1e67dc3ec3d6a18fd7 (diff) | |
| download | chromium_src-675d05bceb030ebbb8e3b2c112129984a106bd56.zip chromium_src-675d05bceb030ebbb8e3b2c112129984a106bd56.tar.gz chromium_src-675d05bceb030ebbb8e3b2c112129984a106bd56.tar.bz2 | |
Remove BuildInfo.isMncOrLater()
Replace these calls with version number check.
BUG=None
TBR=nyquist@chromium.org,qinmin@chromium.org
Review URL: https://codereview.chromium.org/1413693002
Cr-Commit-Position: refs/heads/master@{#354904}
Diffstat (limited to 'media/base/android/java')
| -rw-r--r-- | media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java index bbed99f..7c70c9d 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java @@ -9,7 +9,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; -import org.chromium.base.BuildInfo; import org.chromium.base.Log; import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; @@ -66,10 +65,10 @@ class VideoCaptureFactory { // and carry on pretending the system has no camera(s). This optimization // applies only to pre-M on Android because that is when runtime permissions // were introduced. - if (!BuildInfo.isMncOrLater() + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M && appContext.getPackageManager().checkPermission( - Manifest.permission.CAMERA, appContext.getPackageName()) - != PackageManager.PERMISSION_GRANTED) { + Manifest.permission.CAMERA, appContext.getPackageName()) + != PackageManager.PERMISSION_GRANTED) { sNumberOfSystemCameras = 0; Log.w(TAG, "Missing android.permission.CAMERA permission, " + "no system camera available."); |