Merge pull request #4777 from nextcloud/v16

Make Android v16/JellyBean the new min-supported Android version
This commit is contained in:
Tobias Kaminsky 2019-11-01 09:11:36 +01:00 committed by GitHub
commit bd3ce60985
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -115,7 +115,7 @@ android {
compileSdkVersion 28 compileSdkVersion 28
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
// arguments to be passed to functional tests // arguments to be passed to functional tests

View file

@ -180,7 +180,7 @@ class TestPowerManagementService {
// GIVEN // GIVEN
// device has API level 16 or below // device has API level 16 or below
// battery status sticky intent is available // battery status sticky intent is available
whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.ICE_CREAM_SANDWICH) whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.JELLY_BEAN)
val powerSources = setOf( val powerSources = setOf(
BatteryManager.BATTERY_PLUGGED_AC, BatteryManager.BATTERY_PLUGGED_AC,
BatteryManager.BATTERY_PLUGGED_USB BatteryManager.BATTERY_PLUGGED_USB