blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Fixes master after a-c snapshot changes

master
Sawyer Blatz 2019-04-09 08:57:50 -07:00 committed by Jeff Boek
parent 21919445b1
commit 2e50d1f65f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
View File

@ -5,7 +5,7 @@ package org.mozilla.fenix.components.metrics
import android.content.Context
import mozilla.components.service.glean.Glean
import mozilla.components.service.glean.metrics.NoExtraKeys
import mozilla.components.service.glean.private.NoExtraKeys
import mozilla.components.support.utils.Browsers
import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.GleanMetrics.CrashReporter

2
app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt
View File

@ -36,7 +36,7 @@ enum class PhoneFeature(val id: Int, val androidPermissionsList: Array<String>)
fun getActionLabel(context: Context, sitePermissions: SitePermissions? = null, settings: Settings): String {
return when (this) {
CAMERA -> {
sitePermissions?.cameraBack?.toString(context) ?: settings
sitePermissions?.camera?.toString(context) ?: settings
.getSitePermissionsPhoneFeatureCameraAction()
.toString(context)
}