Merge c1154d7 into c290eca

Author: samedson

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

@@ -16,6 +16,7 @@
 
 package com.google.firebase.sessions
 
+import android.os.Build
 import com.google.firebase.FirebaseApp
 import com.google.firebase.encoders.DataEncoder
 import com.google.firebase.encoders.FieldDescriptor
@@ -127,7 +128,7 @@ internal object SessionEvents {
 
     return ApplicationInfo(
       appId = firebaseApp.options.applicationId,
-      deviceModel = "",
+      deviceModel = Build.MODEL,
       sessionSdkVersion = BuildConfig.VERSION_NAME,
       logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
       androidAppInfo =

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

@@ -17,6 +17,7 @@
 package com.google.firebase.sessions
 
 import android.content.Context
+import android.os.Build
 import androidx.test.core.app.ApplicationProvider
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
@@ -36,7 +37,7 @@ class ApplicationInfoTest {
       .isEqualTo(
         ApplicationInfo(
           appId = FakeFirebaseApp.MOCK_APP_ID,
-          deviceModel = "",
+          deviceModel = Build.MODEL,
           sessionSdkVersion = BuildConfig.VERSION_NAME,
           logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
           AndroidApplicationInfo(

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

@@ -16,6 +16,7 @@
 
 package com.google.firebase.sessions
 
+import android.os.Build
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
@@ -68,7 +69,7 @@ class SessionEventEncoderTest {
             },
             "application_info":{
               "app_id":"1:12345:android:app",
-              "device_model":"",
+              "device_model":"${Build.MODEL}",
               "session_sdk_version":"0.1.0",
               "log_environment":3,
               "android_app_info":{

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

@@ -17,6 +17,7 @@
 package com.google.firebase.sessions.testing
 
 import android.content.Context
+import android.os.Build
 import androidx.test.core.app.ApplicationProvider
 import com.google.firebase.sessions.*
 
@@ -55,7 +56,7 @@ internal object TestSessionEventData {
       applicationInfo =
         ApplicationInfo(
           appId = FakeFirebaseApp.MOCK_APP_ID,
-          deviceModel = "",
+          deviceModel = Build.MODEL,
           sessionSdkVersion = BuildConfig.VERSION_NAME,
           logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
           AndroidApplicationInfo(