Add an ApiHelper check and only call checkSelfPermission if we
are on M and the methods exist.
BUG=
22345681
Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8
* Non-critical permission is location.
*/
private void checkPermissions() {
+ if (!ApiHelper.isMOrHigher()) {
+ Log.v(TAG, "not running on M, skipping permission checks");
+ mHasCriticalPermissions = true;
+ return;
+ }
if (checkSelfPermission(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED &&
checkSelfPermission(Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED &&
return Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP
|| Build.VERSION.SDK_INT == 22; // Lollipop MR1
}
+
+ public static boolean isMOrHigher() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.MNC
+ || "MNC".equals(Build.VERSION.CODENAME);
+ }
}