Unverified Commit 6ae3342f authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'aguestusergl/bug-40075_support-scoped-storage'...

Merge remote-tracking branch 'aguestusergl/bug-40075_support-scoped-storage' into android-components-96.0.15-11.5-1
parents 992d53f7 e2daac07
......@@ -21,8 +21,6 @@ android {
arg("room.schemaLocation", "$projectDir/schemas".toString())
}
}
buildConfigField("boolean", "ANDROID_DOWNLOADS_INTEGRATION", "false")
}
buildTypes {
......
......@@ -371,9 +371,7 @@ abstract class AbstractFetchDownloadService : Service() {
style.notificationAccentColor
)
COMPLETED -> {
if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION) {
addToDownloadSystemDatabaseCompat(download.state, scope)
}
addToDownloadSystemDatabaseCompat(download.state, scope)
DownloadNotification.createDownloadCompletedNotification(
context,
download,
......@@ -841,9 +839,7 @@ abstract class AbstractFetchDownloadService : Service() {
}
@VisibleForTesting
internal fun shouldUseScopedStorage() =
BuildConfig.ANDROID_DOWNLOADS_INTEGRATION &&
getSdkVersion() >= Build.VERSION_CODES.Q
internal fun shouldUseScopedStorage() = getSdkVersion() >= Build.VERSION_CODES.Q
/**
* Gets the SDK version from the system.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment