More'

'

Author: samedson

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ApplicationInfo.kt

@@ -42,6 +42,9 @@ internal data class AndroidApplicationInfo(
 
   /** The build version of the application. */
   val buildVersion: String,
+
+  /** The manufacturer of the device that runs the application. */
+  val deviceManufacturer: String,
 )
 
 internal data class ApplicationInfo(

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvents.kt

@@ -93,6 +93,8 @@ internal object SessionEvents {
           run {
             ctx.add(FieldDescriptor.of("package_name"), androidAppInfo.packageName)
             ctx.add(FieldDescriptor.of("version_name"), androidAppInfo.versionName)
+            ctx.add(FieldDescriptor.of("app_build_version"), androidAppInfo.buildVersion)
+            ctx.add(FieldDescriptor.of("device_manufacturer"), androidAppInfo.deviceManufacturer)
           }
         }
       }
@@ -137,7 +139,8 @@ internal object SessionEvents {
         AndroidApplicationInfo(
           packageName = packageName,
           versionName = packageInfo.versionName,
-          buildVersion = packageInfo.versionCode.toString()
+          buildVersion = packageInfo.versionCode.toString(),
+          deviceManufacturer = Build.MANUFACTURER,
         )
     )
   }

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ApplicationInfoTest.kt

@@ -45,6 +45,7 @@ class ApplicationInfoTest {
             packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
             versionName = FakeFirebaseApp.MOCK_APP_VERSION,
             buildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
+            deviceManufacturer = Build.MANUFACTURER,
           )
         )
       )

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventEncoderTest.kt

@@ -75,7 +75,9 @@ class SessionEventEncoderTest {
               "log_environment":3,
               "android_app_info":{
                 "package_name":"com.google.firebase.sessions.test",
-                "version_name":"1.0.0"
+                "version_name":"1.0.0",
+                "app_build_version":"0",
+                "device_manufacturer":"${Build.MANUFACTURER}"
               }
             }
           }
@@ -104,7 +106,12 @@ class SessionEventEncoderTest {
             sessionSdkVersion = "",
             osDisplayVersion = "",
             logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
-            AndroidApplicationInfo(packageName = "", versionName = "", buildVersion = ""),
+            AndroidApplicationInfo(
+              packageName = "",
+              versionName = "",
+              buildVersion = "",
+              deviceManufacturer = "",
+            ),
           )
       )
 
@@ -135,7 +142,9 @@ class SessionEventEncoderTest {
               "log_environment":3,
               "android_app_info":{
                 "package_name":"",
-                "version_name":""
+                "version_name":"",
+                "app_build_version":"",
+                "device_manufacturer":""
               }
             }
           }

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/TestSessionEventData.kt

@@ -63,6 +63,7 @@ internal object TestSessionEventData {
             packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
             versionName = FakeFirebaseApp.MOCK_APP_VERSION,
             buildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
+            deviceManufacturer = Build.MANUFACTURER,
           ),
         )
     )