From 16332c8c75e8418b67e278c793c2e8fef8c84240 Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Tue, 22 Aug 2023 18:46:03 +0800
Subject: [PATCH 01/11] test first commit

---
 .../MediaSessionHandlerMessengerService.kt                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index d9192f8..d460633 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -297,7 +297,7 @@ class MediaSessionHandlerMessengerService() : Service() {
      * IBinder and is what your service must return from the onBind() callback method.
      */
     override fun onBind(intent: Intent): IBinder? {
-        Log.i("MediaSessionHandler-New", "Service bound new")
+        Log.i("MediaSessionHandler-New", "Service bound new test first commit")
         mMessenger = Messenger(IncomingHandler(this))
         return mMessenger.binder
     }

From 0b2ee547196e2e9efecc26f755dd375fb3b64162 Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Fri, 1 Sep 2023 16:50:12 +0800
Subject: [PATCH 02/11] get Consumption report from Media Stream Handler and
 post to AF via m5

---
 .idea/gradle.xml                              |   1 +
 .../MediaSessionHandlerMessengerService.kt    | 151 +++++++++++++++++-
 .../network/ConsumptionReportingApi.kt        |  13 ++
 3 files changed, 164 insertions(+), 1 deletion(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index d460633..822082d 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -19,11 +19,15 @@ import com.fivegmag.a5gmscommonlibrary.helpers.SessionHandlerMessageTypes
 import com.fivegmag.a5gmscommonlibrary.helpers.Utils
 import com.fivegmag.a5gmscommonlibrary.models.EntryPoint
 import com.fivegmag.a5gmscommonlibrary.models.ServiceAccessInformation
+import com.fivegmag.a5gmscommonlibrary.models.ConsumptionReporting
 import com.fivegmag.a5gmscommonlibrary.models.ServiceListEntry
 import com.fivegmag.a5gmsmediasessionhandler.models.ClientSessionModel
 import com.fivegmag.a5gmsmediasessionhandler.network.HeaderInterceptor
 import com.fivegmag.a5gmsmediasessionhandler.network.ServiceAccessInformationApi
+import com.fivegmag.a5gmsmediasessionhandler.network.ConsumptionReportingApi
+
 import okhttp3.Headers
+import okhttp3.ResponseBody
 import okhttp3.OkHttpClient
 import retrofit2.Call
 import retrofit2.Response
@@ -32,9 +36,12 @@ import retrofit2.converter.gson.GsonConverterFactory
 import java.util.Timer
 import java.util.TimerTask
 
+import kotlin.random.Random
 
 const val TAG = "5GMS Media Session Handler"
 
+const val SamplePercentage_100 = 100;
+
 /**
  * Create a bound service when you want to interact with the service from activities and other components in your application
  * or to expose some of your application's functionality to other applications through interprocess communication (IPC).
@@ -46,6 +53,14 @@ class MediaSessionHandlerMessengerService() : Service() {
      */
     private lateinit var mMessenger: Messenger
     private var clientsSessionData = HashMap<Int, ClientSessionModel>()
+
+    private lateinit var serviceAccessInformationApi: ServiceAccessInformationApi
+    //private lateinit var currentServiceAccessInformation: ServiceAccessInformation
+    private var currentServiceAccessInformation: ServiceAccessInformation? = null
+
+    private lateinit var consumptionReportingApi: ConsumptionReportingApi
+    private lateinit var serverAddressesForConsumpReport: String
+    
     private val headerInterceptor = HeaderInterceptor()
     private val utils = Utils()
     private val okHttpClient = OkHttpClient()
@@ -74,6 +89,7 @@ class MediaSessionHandlerMessengerService() : Service() {
                 )
 
                 SessionHandlerMessageTypes.SET_M5_ENDPOINT -> setM5Endpoint(msg)
+                SessionHandlerMessageTypes.CONSUMPTION_REPORTING_MESSAGE -> reportConsumption(msg)
                 else -> super.handleMessage(msg)
             }
         }
@@ -123,6 +139,15 @@ class MediaSessionHandlerMessengerService() : Service() {
                     val resource =
                         handleServiceAccessResponse(response, sendingUid, provisioningSessionId)
 
+                    // initialize Retrofit for ConsumptionReporting
+                    currentServiceAccessInformation = resource
+                    if(currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses.isNotEmpty())
+                    {
+                        val serverAddressesForConsumpReport: String  = currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses[0];
+                        Log.i(TAG, ">>>shilin: clientConsumptionReportingConfiguration serverAddresses0:  $serverAddressesForConsumpReport.")
+                        initializeRetrofitForConsumpReport(serverAddressesForConsumpReport)
+                    }
+
                     // Trigger the playback by providing all available entry points
                     val msgResponse: Message = Message.obtain(
                         null,
@@ -144,6 +169,7 @@ class MediaSessionHandlerMessengerService() : Service() {
                 }
 
                 override fun onFailure(call: Call<ServiceAccessInformation?>, t: Throwable) {
+                    Log.i(TAG, ">>>shilin: debug onFailure")
                     call.cancel()
                 }
             })
@@ -297,10 +323,133 @@ class MediaSessionHandlerMessengerService() : Service() {
      * IBinder and is what your service must return from the onBind() callback method.
      */
     override fun onBind(intent: Intent): IBinder? {
-        Log.i("MediaSessionHandler-New", "Service bound new test first commit")
+        Log.i("MediaSessionHandler-New", "Service bound new")
         mMessenger = Messenger(IncomingHandler(this))
         return mMessenger.binder
     }
 
+    /* Refer to TS26.512 Clause 4.7.4
+    The Service Access Information indicating whether Consumption Reporting is provisioned for downlink streaming
+    sessions is described in clause 11.2.3. When the clientConsumptionReportingConfiguration.samplePercentage
+    value is 100, the Media Session Handler shall activate the consumption reporting procedure.
+    If the samplePercentage is less than 100, the Media Session Handler shall generate a random number
+    which is uniformly distributed in the range of 0 to 100, and the Media Session Handler shall activate
+    the consumption report procedure when the generated random number is of a lower value than
+    the samplePercentage value.The Service Access Information indicating whether Consumption Reporting
+    is provisioned for downlink streaming sessions is described in clause 11.2.3. When the
+    clientConsumptionReportingConfiguration.samplePercentage value is 100, the Media Session Handler
+    shall activate the consumption reporting procedure. If the samplePercentage is less than 100,
+    the Media Session Handler shall generate a random number which is uniformly distributed in
+    the range of 0 to 100, and the Media Session Handler shall activate the consumption report
+    procedure when the generated random number is of a lower value than the samplePercentage value.
+    The Service Access Information indicating whether Consumption Reporting is provisioned for downlink streaming sessions is described in clause 11.2.3. When the clientConsumptionReportingConfiguration.samplePercentage value is 100, the Media Session Handler shall activate the consumption reporting procedure. If the samplePercentage is less than 100, the Media Session Handler shall generate a random number which is uniformly distributed in the range of 0 to 100, and the Media Session Handler shall activate the consumption report procedure when the generated random number is of a lower value than the samplePercentage value.
+     */
+    private fun IsConsumptionReportingActivated(): Boolean {
+        //if(currentServiceAccessInformation.isInitialized) {
+        if(currentServiceAccessInformation == null) {
+            return false
+        }
+
+        var samplePercentage: UInt =  currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.samplePercentage;
+        if(samplePercentage > SamplePercentage_100.toUInt())
+        {
+            Log.i(TAG, "shilin>>>Invaild samplePercentage $samplePercentage in currentServiceAccessInformation")
+            return false;
+        }
+
+        if(SamplePercentage_100.toUInt() == samplePercentage)
+        {
+            return true;
+        }
+
+        val myRandomValue = Random.nextInt(0, SamplePercentage_100)
+        if(myRandomValue.toUInt() >= samplePercentage)
+        {
+            Log.i(TAG, "shilin>>>IsConsumptionReportingActivated true:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
+            return true;
+        }
+        else
+        {
+            Log.i(TAG, "shilin>>>IsConsumptionReportingActivated false:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
+            return false;
+        }
+    }
+
+    /* Refer to TS26.512 Clause 4.7.4
+                TS26.501 Clause 5.6.3*/
+    private fun NeedReportConsumption(): Boolean {
+        // check IsConsumptionReportingActivated
+        if (!IsConsumptionReportingActivated())
+        {
+            Log.i(TAG, "shilin>>>ReportConsumption not Activated")
+            return false;
+        }
+
+        // Start/stop of consumption of a downlink streaming session
+        // triggered when PlayerStates.PLAYING  &  PlayerStates.ENDED
+        /*if( Start || stop)
+        {
+            return true;
+        }*/
+
+        // check clientConsumptionReportingConfiguration.reportingInterval, start a timer
+        // reportConsumptionTimer()
+
+        // check clientConsumptionReportingConfiguration.locationReporting
+        // check clientConsumptionReportingConfiguration.accessReporting
+        if(currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.locationReporting
+            || currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.accessReporting)
+        {
+             return true;
+        }
+
+        return false;
+    }
 
+    private fun reportConsumption(msg: Message) {
+        if (!NeedReportConsumption())
+        {
+            Log.i(TAG, "shilin>>>Not need ReportConsumption")
+            return
+        }
+
+        val bundle: Bundle = msg.data
+        bundle.classLoader = ConsumptionReporting::class.java.classLoader
+        //val data: String = bundle.getString("ConsumptionData", "")
+        val dataReporting: ConsumptionReporting? = bundle.getParcelable("consumptionData")
+
+        Log.i(TAG, "reportConsumption ClientId: ${dataReporting?.reportingClientId}.")
+        Toast.makeText(
+            applicationContext,
+            "MSH recv Consumption-ID: ${dataReporting?.reportingClientId}",
+            Toast.LENGTH_LONG
+        ).show()
+
+        // call m5 report consumption to AF - TS26.512 Clause 4.7.4
+        val aspId: String = "2";
+        val call: Call<ResponseBody>? = consumptionReportingApi.postConsumptionReporting(aspId,dataReporting?.reportingClientId);
+
+        call?.enqueue(object : retrofit2.Callback<ResponseBody> {
+            override fun onResponse(
+                call: Call<ResponseBody?>,
+                response: Response<ResponseBody?>
+            ) {
+                Log.i(TAG, "shilin>>resp from AF:"+ response.body()?.string())
+                //System.out.println(">>>>>>>>>>>>"+response.body());
+            }
+
+            override fun onFailure(call: Call<ResponseBody?>, t: Throwable) {
+                Log.i(TAG, "shilin>>onFailure")
+                call.cancel()
+            }
+        })
+    }
+    
+    private fun initializeRetrofitForConsumpReport(url: String) {
+        val m5RetrofitConsump: Retrofit = Retrofit.Builder()
+            .baseUrl(url)
+            //.addConverterFactory(GsonConverterFactory.create())
+            .build()
+        consumptionReportingApi     = m5RetrofitConsump.create(ConsumptionReportingApi::class.java)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
index bcf9dee..6f06634 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
@@ -9,5 +9,18 @@ https://drive.google.com/file/d/1cinCiA778IErENZ3JN52VFW-1ffHpx7Z/view
 
 package com.fivegmag.a5gmsmediasessionhandler.network
 
+import com.fivegmag.a5gmscommonlibrary.models.ConsumptionReporting
+import okhttp3.ResponseBody
+import retrofit2.Call
+import retrofit2.http.Path
+import retrofit2.http.Field;
+import retrofit2.http.FieldMap;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.POST
+
 interface ConsumptionReportingApi {
+    @FormUrlEncoded
+    @POST("consumption-reporting/{aspId}")
+    fun postConsumptionReporting(@Path("aspId") aspId: String?, @Field("data") data: String?): Call<ResponseBody>?
+    //fun postConsumptionReporting(@Path("aspId") aspId: String?, @Field("data") data: String ): Call<String>?
 }
\ No newline at end of file

From fcb38c6dfc72a0d4e7b28fdfa83d7496c867bdef Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Thu, 7 Sep 2023 15:52:23 +0800
Subject: [PATCH 03/11] change data type of
 ServiceAccessInformation.clientConsumptionReportingConfiguration.samplePercentage
 from UInt to Float

---
 .idea/compiler.xml                                 |  2 +-
 .../MediaSessionHandlerMessengerService.kt         | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index 822082d..8ed1ad0 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -40,7 +40,7 @@ import kotlin.random.Random
 
 const val TAG = "5GMS Media Session Handler"
 
-const val SamplePercentage_100 = 100;
+const val SamplePercentageMax: Float = 100.0F;
 
 /**
  * Create a bound service when you want to interact with the service from activities and other components in your application
@@ -350,20 +350,22 @@ class MediaSessionHandlerMessengerService() : Service() {
             return false
         }
 
-        var samplePercentage: UInt =  currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.samplePercentage;
-        if(samplePercentage > SamplePercentage_100.toUInt())
+        var samplePercentage: Float =  currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.samplePercentage;
+        if(samplePercentage > SamplePercentageMax)
         {
             Log.i(TAG, "shilin>>>Invaild samplePercentage $samplePercentage in currentServiceAccessInformation")
             return false;
         }
 
-        if(SamplePercentage_100.toUInt() == samplePercentage)
+        if(SamplePercentageMax == samplePercentage)
         {
             return true;
         }
 
-        val myRandomValue = Random.nextInt(0, SamplePercentage_100)
-        if(myRandomValue.toUInt() >= samplePercentage)
+        val myRandomFloat:Float     = Random.nextFloat()
+        val myRandomInt:Int         = Random.nextInt(0, SamplePercentageMax.toInt())
+        val myRandomValue:Float     = myRandomInt - 1 + myRandomFloat
+        if(myRandomValue >= samplePercentage)
         {
             Log.i(TAG, "shilin>>>IsConsumptionReportingActivated true:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
             return true;

From 306a7dd6253c54e713e1cee0bf9440994276b6e5 Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Thu, 7 Sep 2023 20:26:57 +0800
Subject: [PATCH 04/11] 1. reuse retrofitBuilder with Metric Reporting 2.
 refine compare between Float 3. refine log

---
 .../MediaSessionHandlerMessengerService.kt    | 66 ++++++++++++-------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index 8ed1ad0..bc95331 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -35,12 +35,14 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.Timer
 import java.util.TimerTask
+import kotlin.math.abs
 
 import kotlin.random.Random
 
 const val TAG = "5GMS Media Session Handler"
 
-const val SamplePercentageMax: Float = 100.0F;
+const val SamplePercentageMax: Float    = 100.0F;
+const val EPSILON: Float                = 0.0001F;
 
 /**
  * Create a bound service when you want to interact with the service from activities and other components in your application
@@ -55,9 +57,8 @@ class MediaSessionHandlerMessengerService() : Service() {
     private var clientsSessionData = HashMap<Int, ClientSessionModel>()
 
     private lateinit var serviceAccessInformationApi: ServiceAccessInformationApi
-    //private lateinit var currentServiceAccessInformation: ServiceAccessInformation
     private var currentServiceAccessInformation: ServiceAccessInformation? = null
-
+    
     private lateinit var consumptionReportingApi: ConsumptionReportingApi
     private lateinit var serverAddressesForConsumpReport: String
     
@@ -139,13 +140,12 @@ class MediaSessionHandlerMessengerService() : Service() {
                     val resource =
                         handleServiceAccessResponse(response, sendingUid, provisioningSessionId)
 
-                    // initialize Retrofit for ConsumptionReporting
+                    // create Retrofit for ConsumptionReporting
                     currentServiceAccessInformation = resource
                     if(currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses.isNotEmpty())
                     {
                         val serverAddressesForConsumpReport: String  = currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses[0];
-                        Log.i(TAG, ">>>shilin: clientConsumptionReportingConfiguration serverAddresses0:  $serverAddressesForConsumpReport.")
-                        initializeRetrofitForConsumpReport(serverAddressesForConsumpReport)
+                        createRetrofitForConsumpReport(serverAddressesForConsumpReport)
                     }
 
                     // Trigger the playback by providing all available entry points
@@ -165,11 +165,10 @@ class MediaSessionHandlerMessengerService() : Service() {
                         msgResponse.data = responseBundle
                         responseMessenger.send(msgResponse)
                     }
-
                 }
 
                 override fun onFailure(call: Call<ServiceAccessInformation?>, t: Throwable) {
-                    Log.i(TAG, ">>>shilin: debug onFailure")
+                    Log.i(TAG, "debug onFailure")
                     call.cancel()
                 }
             })
@@ -347,18 +346,22 @@ class MediaSessionHandlerMessengerService() : Service() {
     private fun IsConsumptionReportingActivated(): Boolean {
         //if(currentServiceAccessInformation.isInitialized) {
         if(currentServiceAccessInformation == null) {
+            Log.i(TAG, "[ConsumptionReporting] currentServiceAccessInformation is 【NULL】")
             return false
         }
 
+        // validate samplePercentage in ServiceAccessInformation.clientConsumptionReportingConfiguration
         var samplePercentage: Float =  currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.samplePercentage;
         if(samplePercentage > SamplePercentageMax)
         {
-            Log.i(TAG, "shilin>>>Invaild samplePercentage $samplePercentage in currentServiceAccessInformation")
+            Log.i(TAG, "[ConsumptionReporting] Invaild samplePercentage[$samplePercentage] in ServiceAccessInformation.clientConsumptionReportingConfiguration")
             return false;
         }
 
-        if(SamplePercentageMax == samplePercentage)
+        // if samplePercentage == 100, always report
+        if(abs(SamplePercentageMax - samplePercentage) < EPSILON)
         {
+            Log.i(TAG, "[ConsumptionReporting] SamplePercentage==SamplePercentageMax, always report")
             return true;
         }
 
@@ -367,12 +370,12 @@ class MediaSessionHandlerMessengerService() : Service() {
         val myRandomValue:Float     = myRandomInt - 1 + myRandomFloat
         if(myRandomValue >= samplePercentage)
         {
-            Log.i(TAG, "shilin>>>IsConsumptionReportingActivated true:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
+            Log.i(TAG, "[ConsumptionReporting]IsConsumptionReportingActivated 【TRUE】:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
             return true;
         }
         else
         {
-            Log.i(TAG, "shilin>>>IsConsumptionReportingActivated false:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
+            Log.i(TAG, "[ConsumptionReporting]IsConsumptionReportingActivated 【FALSE】:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
             return false;
         }
     }
@@ -383,7 +386,7 @@ class MediaSessionHandlerMessengerService() : Service() {
         // check IsConsumptionReportingActivated
         if (!IsConsumptionReportingActivated())
         {
-            Log.i(TAG, "shilin>>>ReportConsumption not Activated")
+            Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated is 【FALSE】")
             return false;
         }
 
@@ -411,7 +414,7 @@ class MediaSessionHandlerMessengerService() : Service() {
     private fun reportConsumption(msg: Message) {
         if (!NeedReportConsumption())
         {
-            Log.i(TAG, "shilin>>>Not need ReportConsumption")
+            Log.i(TAG, "[ConsumptionReporting] Not need ReportConsumption")
             return
         }
 
@@ -420,14 +423,21 @@ class MediaSessionHandlerMessengerService() : Service() {
         //val data: String = bundle.getString("ConsumptionData", "")
         val dataReporting: ConsumptionReporting? = bundle.getParcelable("consumptionData")
 
-        Log.i(TAG, "reportConsumption ClientId: ${dataReporting?.reportingClientId}.")
+        Log.i(TAG, "[ConsumptionReporting] reportConsumption ClientId: ${dataReporting?.reportingClientId}.")
         Toast.makeText(
             applicationContext,
             "MSH recv Consumption-ID: ${dataReporting?.reportingClientId}",
             Toast.LENGTH_LONG
         ).show()
 
+
         // call m5 report consumption to AF - TS26.512 Clause 4.7.4
+        if(consumptionReportingApi == null)
+        {
+            Log.i(TAG, "[ConsumptionReporting] consumptionReportingApi is 【NULL】")
+            return;
+        }
+
         val aspId: String = "2";
         val call: Call<ResponseBody>? = consumptionReportingApi.postConsumptionReporting(aspId,dataReporting?.reportingClientId);
 
@@ -436,22 +446,30 @@ class MediaSessionHandlerMessengerService() : Service() {
                 call: Call<ResponseBody?>,
                 response: Response<ResponseBody?>
             ) {
-                Log.i(TAG, "shilin>>resp from AF:"+ response.body()?.string())
-                //System.out.println(">>>>>>>>>>>>"+response.body());
+                Log.i(TAG, "[ConsumptionReporting] resp from AF:"+ response.body()?.string())
             }
 
             override fun onFailure(call: Call<ResponseBody?>, t: Throwable) {
-                Log.i(TAG, "shilin>>onFailure")
+                Log.i(TAG, "[ConsumptionReporting] onFailure")
                 call.cancel()
             }
         })
     }
     
-    private fun initializeRetrofitForConsumpReport(url: String) {
-        val m5RetrofitConsump: Retrofit = Retrofit.Builder()
-            .baseUrl(url)
-            //.addConverterFactory(GsonConverterFactory.create())
-            .build()
-        consumptionReportingApi     = m5RetrofitConsump.create(ConsumptionReportingApi::class.java)
+    private fun createRetrofitForConsumpReport(consumpReportUrl: String) {
+        try {
+            Log.i(TAG, "[ConsumptionReporting] createRetrofitForConsumpReport URL: $consumpReportUrl.")
+
+            if (consumpReportUrl != null) {
+                val retrofit = retrofitBuilder
+                    .baseUrl(consumpReportUrl)
+                    .build()
+
+                ////  todo: support multi Clients
+                consumptionReportingApi = retrofit.create(ConsumptionReportingApi::class.java)
+            }
+        } catch (e: Exception) {
+        }
     }
+
 }
\ No newline at end of file

From 8f1190fcfabcaf5e86da8eadc8692fb9df9fc2cd Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Fri, 8 Sep 2023 12:21:25 +0800
Subject: [PATCH 05/11] 1. use the same clientsSessionData
 currentServiceAccessInformation session with Metric 2. Consumption reporting
 support multi Clients

---
 .../MediaSessionHandlerMessengerService.kt    | 53 ++++++++-----------
 .../models/ClientSessionModel.kt              |  2 +
 .../network/ConsumptionReportingApi.kt        |  1 -
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index bc95331..1b7ea39 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -55,13 +55,6 @@ class MediaSessionHandlerMessengerService() : Service() {
      */
     private lateinit var mMessenger: Messenger
     private var clientsSessionData = HashMap<Int, ClientSessionModel>()
-
-    private lateinit var serviceAccessInformationApi: ServiceAccessInformationApi
-    private var currentServiceAccessInformation: ServiceAccessInformation? = null
-    
-    private lateinit var consumptionReportingApi: ConsumptionReportingApi
-    private lateinit var serverAddressesForConsumpReport: String
-    
     private val headerInterceptor = HeaderInterceptor()
     private val utils = Utils()
     private val okHttpClient = OkHttpClient()
@@ -141,12 +134,7 @@ class MediaSessionHandlerMessengerService() : Service() {
                         handleServiceAccessResponse(response, sendingUid, provisioningSessionId)
 
                     // create Retrofit for ConsumptionReporting
-                    currentServiceAccessInformation = resource
-                    if(currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses.isNotEmpty())
-                    {
-                        val serverAddressesForConsumpReport: String  = currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses[0];
-                        createRetrofitForConsumpReport(serverAddressesForConsumpReport)
-                    }
+                    createRetrofitForConsumpReport(sendingUid)
 
                     // Trigger the playback by providing all available entry points
                     val msgResponse: Message = Message.obtain(
@@ -343,15 +331,15 @@ class MediaSessionHandlerMessengerService() : Service() {
     procedure when the generated random number is of a lower value than the samplePercentage value.
     The Service Access Information indicating whether Consumption Reporting is provisioned for downlink streaming sessions is described in clause 11.2.3. When the clientConsumptionReportingConfiguration.samplePercentage value is 100, the Media Session Handler shall activate the consumption reporting procedure. If the samplePercentage is less than 100, the Media Session Handler shall generate a random number which is uniformly distributed in the range of 0 to 100, and the Media Session Handler shall activate the consumption report procedure when the generated random number is of a lower value than the samplePercentage value.
      */
-    private fun IsConsumptionReportingActivated(): Boolean {
-        //if(currentServiceAccessInformation.isInitialized) {
-        if(currentServiceAccessInformation == null) {
-            Log.i(TAG, "[ConsumptionReporting] currentServiceAccessInformation is 【NULL】")
+    private fun IsConsumptionReportingActivated(clientId: Int): Boolean {
+        //if(currentServiceAccessInformation.isInitialized)
+        if(clientsSessionData[clientId]?.serviceAccessInformation == null) {
+            Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated: ServiceAccessInformation is 【NULL】")
             return false
         }
 
         // validate samplePercentage in ServiceAccessInformation.clientConsumptionReportingConfiguration
-        var samplePercentage: Float =  currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.samplePercentage;
+        var samplePercentage: Float =  clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.samplePercentage;
         if(samplePercentage > SamplePercentageMax)
         {
             Log.i(TAG, "[ConsumptionReporting] Invaild samplePercentage[$samplePercentage] in ServiceAccessInformation.clientConsumptionReportingConfiguration")
@@ -382,11 +370,11 @@ class MediaSessionHandlerMessengerService() : Service() {
 
     /* Refer to TS26.512 Clause 4.7.4
                 TS26.501 Clause 5.6.3*/
-    private fun NeedReportConsumption(): Boolean {
+    private fun NeedReportConsumption(clientId: Int): Boolean {
         // check IsConsumptionReportingActivated
-        if (!IsConsumptionReportingActivated())
+        if (!IsConsumptionReportingActivated(clientId))
         {
-            Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated is 【FALSE】")
+            //Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated is 【FALSE】")
             return false;
         }
 
@@ -402,8 +390,8 @@ class MediaSessionHandlerMessengerService() : Service() {
 
         // check clientConsumptionReportingConfiguration.locationReporting
         // check clientConsumptionReportingConfiguration.accessReporting
-        if(currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.locationReporting
-            || currentServiceAccessInformation!!.clientConsumptionReportingConfiguration.accessReporting)
+        if(clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.locationReporting
+            || clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.accessReporting)
         {
              return true;
         }
@@ -412,7 +400,8 @@ class MediaSessionHandlerMessengerService() : Service() {
     }
 
     private fun reportConsumption(msg: Message) {
-        if (!NeedReportConsumption())
+        val sendingUid = msg.sendingUid;
+        if (!NeedReportConsumption(sendingUid))
         {
             Log.i(TAG, "[ConsumptionReporting] Not need ReportConsumption")
             return
@@ -420,7 +409,6 @@ class MediaSessionHandlerMessengerService() : Service() {
 
         val bundle: Bundle = msg.data
         bundle.classLoader = ConsumptionReporting::class.java.classLoader
-        //val data: String = bundle.getString("ConsumptionData", "")
         val dataReporting: ConsumptionReporting? = bundle.getParcelable("consumptionData")
 
         Log.i(TAG, "[ConsumptionReporting] reportConsumption ClientId: ${dataReporting?.reportingClientId}.")
@@ -432,6 +420,7 @@ class MediaSessionHandlerMessengerService() : Service() {
 
 
         // call m5 report consumption to AF - TS26.512 Clause 4.7.4
+        val consumptionReportingApi: ConsumptionReportingApi? = clientsSessionData[sendingUid]?.consumptionReportingApi
         if(consumptionReportingApi == null)
         {
             Log.i(TAG, "[ConsumptionReporting] consumptionReportingApi is 【NULL】")
@@ -456,17 +445,21 @@ class MediaSessionHandlerMessengerService() : Service() {
         })
     }
     
-    private fun createRetrofitForConsumpReport(consumpReportUrl: String) {
+    private fun createRetrofitForConsumpReport(clientId: Int) {
         try {
-            Log.i(TAG, "[ConsumptionReporting] createRetrofitForConsumpReport URL: $consumpReportUrl.")
+            var consumpReportUrl: String = "";
+            if(clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses.isNotEmpty())
+            {
+                consumpReportUrl = clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses[0];
+            }
+            Log.i(TAG, "[ConsumptionReporting] createRetrofitForConsumpReport URL---: $consumpReportUrl.")
 
-            if (consumpReportUrl != null) {
+            if (consumpReportUrl != "") {
                 val retrofit = retrofitBuilder
                     .baseUrl(consumpReportUrl)
                     .build()
 
-                ////  todo: support multi Clients
-                consumptionReportingApi = retrofit.create(ConsumptionReportingApi::class.java)
+                clientsSessionData[clientId]?.consumptionReportingApi = retrofit.create(ConsumptionReportingApi::class.java)
             }
         } catch (e: Exception) {
         }
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
index aa23232..9baf723 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
@@ -3,6 +3,7 @@ package com.fivegmag.a5gmsmediasessionhandler.models
 import android.os.Messenger
 import com.fivegmag.a5gmscommonlibrary.models.ServiceAccessInformation
 import com.fivegmag.a5gmsmediasessionhandler.network.ServiceAccessInformationApi
+import com.fivegmag.a5gmsmediasessionhandler.network.ConsumptionReportingApi
 import okhttp3.Headers
 import java.util.Timer
 
@@ -10,6 +11,7 @@ data class ClientSessionModel(
     var messenger: Messenger?,
     var serviceAccessInformation: ServiceAccessInformation? = null,
     var serviceAccessInformationApi: ServiceAccessInformationApi? = null,
+    var consumptionReportingApi: ConsumptionReportingApi? = null,
     var serviceAccessInformationResponseHeaders: Headers? = null,
     var serviceAccessInformationRequestTimer: Timer? = null
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
index 6f06634..3b3ee1f 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
@@ -22,5 +22,4 @@ interface ConsumptionReportingApi {
     @FormUrlEncoded
     @POST("consumption-reporting/{aspId}")
     fun postConsumptionReporting(@Path("aspId") aspId: String?, @Field("data") data: String?): Call<ResponseBody>?
-    //fun postConsumptionReporting(@Path("aspId") aspId: String?, @Field("data") data: String ): Call<String>?
 }
\ No newline at end of file

From 94b055f4e4bedef5d1ba6400992a4c0595755516 Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Fri, 8 Sep 2023 16:34:27 +0800
Subject: [PATCH 06/11] small code optimizations

---
 .../MediaSessionHandlerMessengerService.kt    | 79 +++++++------------
 1 file changed, 30 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index 1b7ea39..74f40fe 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -35,12 +35,12 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.Timer
 import java.util.TimerTask
-import kotlin.math.abs
 
+import kotlin.math.abs
 import kotlin.random.Random
 
-const val TAG = "5GMS Media Session Handler"
 
+const val TAG = "5GMS Media Session Handler"
 const val SamplePercentageMax: Float    = 100.0F;
 const val EPSILON: Float                = 0.0001F;
 
@@ -315,23 +315,12 @@ class MediaSessionHandlerMessengerService() : Service() {
         return mMessenger.binder
     }
 
-    /* Refer to TS26.512 Clause 4.7.4
-    The Service Access Information indicating whether Consumption Reporting is provisioned for downlink streaming
-    sessions is described in clause 11.2.3. When the clientConsumptionReportingConfiguration.samplePercentage
-    value is 100, the Media Session Handler shall activate the consumption reporting procedure.
-    If the samplePercentage is less than 100, the Media Session Handler shall generate a random number
-    which is uniformly distributed in the range of 0 to 100, and the Media Session Handler shall activate
-    the consumption report procedure when the generated random number is of a lower value than
-    the samplePercentage value.The Service Access Information indicating whether Consumption Reporting
-    is provisioned for downlink streaming sessions is described in clause 11.2.3. When the
-    clientConsumptionReportingConfiguration.samplePercentage value is 100, the Media Session Handler
-    shall activate the consumption reporting procedure. If the samplePercentage is less than 100,
-    the Media Session Handler shall generate a random number which is uniformly distributed in
-    the range of 0 to 100, and the Media Session Handler shall activate the consumption report
-    procedure when the generated random number is of a lower value than the samplePercentage value.
-    The Service Access Information indicating whether Consumption Reporting is provisioned for downlink streaming sessions is described in clause 11.2.3. When the clientConsumptionReportingConfiguration.samplePercentage value is 100, the Media Session Handler shall activate the consumption reporting procedure. If the samplePercentage is less than 100, the Media Session Handler shall generate a random number which is uniformly distributed in the range of 0 to 100, and the Media Session Handler shall activate the consumption report procedure when the generated random number is of a lower value than the samplePercentage value.
+    /** If the consumption reporting procedure is activated. Refer to TS26.512 Clause 4.7.4
+     * When the clientConsumptionReportingConfiguration.samplePercentage value is 100, the Media Session Handler shall activate the consumption reporting procedure.
+     * If the samplePercentage is less than 100, the Media Session Handler shall generate a random number which is uniformly distributed in the range of 0 to 100,
+     * and the Media Session Handler shall activate the consumption report procedure when the generated random number is of a lower value than the samplePercentage value.
      */
-    private fun IsConsumptionReportingActivated(clientId: Int): Boolean {
+    private fun isConsumptionReportingActivated(clientId: Int): Boolean {
         //if(currentServiceAccessInformation.isInitialized)
         if(clientsSessionData[clientId]?.serviceAccessInformation == null) {
             Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated: ServiceAccessInformation is 【NULL】")
@@ -340,7 +329,7 @@ class MediaSessionHandlerMessengerService() : Service() {
 
         // validate samplePercentage in ServiceAccessInformation.clientConsumptionReportingConfiguration
         var samplePercentage: Float =  clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.samplePercentage;
-        if(samplePercentage > SamplePercentageMax)
+        if(samplePercentage > SamplePercentageMax || samplePercentage < 0)
         {
             Log.i(TAG, "[ConsumptionReporting] Invaild samplePercentage[$samplePercentage] in ServiceAccessInformation.clientConsumptionReportingConfiguration")
             return false;
@@ -353,43 +342,35 @@ class MediaSessionHandlerMessengerService() : Service() {
             return true;
         }
 
-        val myRandomFloat:Float     = Random.nextFloat()
-        val myRandomInt:Int         = Random.nextInt(0, SamplePercentageMax.toInt())
-        val myRandomValue:Float     = myRandomInt - 1 + myRandomFloat
-        if(myRandomValue >= samplePercentage)
-        {
-            Log.i(TAG, "[ConsumptionReporting]IsConsumptionReportingActivated 【TRUE】:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
-            return true;
-        }
-        else
-        {
-            Log.i(TAG, "[ConsumptionReporting]IsConsumptionReportingActivated 【FALSE】:myRandomValue[$myRandomValue],samplePercentage[$samplePercentage]")
-            return false;
-        }
+        val randomFloat:Float     = Random.nextFloat()
+        val randomInt:Int         = Random.nextInt(0, SamplePercentageMax.toInt())
+        val randomValue:Float     = randomInt - 1 + randomFloat
+        Log.i(TAG, "[ConsumptionReporting] isConsumptionReportingActivated:myRandomValue[$randomValue],samplePercentage[$samplePercentage]")
+
+        return randomValue < samplePercentage
     }
 
-    /* Refer to TS26.512 Clause 4.7.4
-                TS26.501 Clause 5.6.3*/
-    private fun NeedReportConsumption(clientId: Int): Boolean {
+    /** Refer to TS26.512 Clause 4.7.4 TS26.501 Clause 5.6.3
+        If the consumption reporting procedure is activated, the Media Session Handler shall submit a consumption report to the 5GMSd AF
+        when any of the 5 conditions occur
+     */
+    private fun isNeedReportConsumption(clientId: Int): Boolean {
         // check IsConsumptionReportingActivated
-        if (!IsConsumptionReportingActivated(clientId))
+        if (!isConsumptionReportingActivated(clientId))
         {
-            //Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated is 【FALSE】")
+            Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated is 【FALSE】")
             return false;
         }
 
-        // Start/stop of consumption of a downlink streaming session
-        // triggered when PlayerStates.PLAYING  &  PlayerStates.ENDED
-        /*if( Start || stop)
-        {
-            return true;
-        }*/
+        // Condition 1/2: Start/stop of consumption of a downlink streaming session
+        // In Media Stream handler, when condition 1/2 occur, reportConsumption
+        //// to check, need return
 
-        // check clientConsumptionReportingConfiguration.reportingInterval, start a timer
-        // reportConsumptionTimer()
+        // Condition 3: check clientConsumptionReportingConfiguration.reportingInterval, timer trigger
+        // In Media Stream handler, reportConsumptionTimer()
+        //// to check, need return
 
-        // check clientConsumptionReportingConfiguration.locationReporting
-        // check clientConsumptionReportingConfiguration.accessReporting
+        // Condition 4/5:check clientConsumptionReportingConfiguration.locationReporting and clientConsumptionReportingConfiguration.accessReporting
         if(clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.locationReporting
             || clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.accessReporting)
         {
@@ -401,7 +382,7 @@ class MediaSessionHandlerMessengerService() : Service() {
 
     private fun reportConsumption(msg: Message) {
         val sendingUid = msg.sendingUid;
-        if (!NeedReportConsumption(sendingUid))
+        if (!isNeedReportConsumption(sendingUid))
         {
             Log.i(TAG, "[ConsumptionReporting] Not need ReportConsumption")
             return
@@ -452,7 +433,7 @@ class MediaSessionHandlerMessengerService() : Service() {
             {
                 consumpReportUrl = clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.serverAddresses[0];
             }
-            Log.i(TAG, "[ConsumptionReporting] createRetrofitForConsumpReport URL---: $consumpReportUrl.")
+            Log.i(TAG, "[ConsumptionReporting] createRetrofitForConsumpReport URL: $consumpReportUrl.")
 
             if (consumpReportUrl != "") {
                 val retrofit = retrofitBuilder

From 13898d34580d51313095d1ab53c5a4d5a32842fb Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Fri, 8 Sep 2023 19:00:50 +0800
Subject: [PATCH 07/11] replace parameter aspId by provisisioningSessionId

---
 .../MediaSessionHandlerMessengerService.kt                  | 6 +++---
 .../network/ConsumptionReportingApi.kt                      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index 74f40fe..093ecbd 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -408,15 +408,15 @@ class MediaSessionHandlerMessengerService() : Service() {
             return;
         }
 
-        val aspId: String = "2";
-        val call: Call<ResponseBody>? = consumptionReportingApi.postConsumptionReporting(aspId,dataReporting?.reportingClientId);
+        val provisisioningSessionId: String = "2";
+        val call: Call<ResponseBody>? = consumptionReportingApi.postConsumptionReporting(provisisioningSessionId, dataReporting?.reportingClientId);
 
         call?.enqueue(object : retrofit2.Callback<ResponseBody> {
             override fun onResponse(
                 call: Call<ResponseBody?>,
                 response: Response<ResponseBody?>
             ) {
-                Log.i(TAG, "[ConsumptionReporting] resp from AF:"+ response.body()?.string())
+                Log.i(TAG, "[ConsumptionReporting] resp from AF:" + response.body()?.string())
             }
 
             override fun onFailure(call: Call<ResponseBody?>, t: Throwable) {
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
index 3b3ee1f..00d0105 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/network/ConsumptionReportingApi.kt
@@ -20,6 +20,6 @@ import retrofit2.http.POST
 
 interface ConsumptionReportingApi {
     @FormUrlEncoded
-    @POST("consumption-reporting/{aspId}")
-    fun postConsumptionReporting(@Path("aspId") aspId: String?, @Field("data") data: String?): Call<ResponseBody>?
+    @POST("consumption-reporting/{provisisioningSessionId}")
+    fun postConsumptionReporting(@Path("provisisioningSessionId") provisisioningSessionId: String?, @Field("reportingClientId") reportingClientId: String?): Call<ResponseBody>?
 }
\ No newline at end of file

From 87d9c2b0e2f5fe8a257aa100347fd73e2099f7df Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Fri, 15 Sep 2023 12:20:29 +0800
Subject: [PATCH 08/11] move the timer for Consumption Report to MSH, in line
 with Metric Report

---
 .../MediaSessionHandlerMessengerService.kt    | 54 +++++++++++++++----
 .../models/ClientSessionModel.kt              |  4 +-
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index 093ecbd..9faa1bd 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -33,7 +33,9 @@ import retrofit2.Call
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+
 import java.util.Timer
+import java.util.Date
 import java.util.TimerTask
 
 import kotlin.math.abs
@@ -133,8 +135,9 @@ class MediaSessionHandlerMessengerService() : Service() {
                     val resource =
                         handleServiceAccessResponse(response, sendingUid, provisioningSessionId)
 
-                    // create Retrofit for ConsumptionReporting
+                    // create Retrofit for ConsumptionReporting, and start ConsumptionReport Timer
                     createRetrofitForConsumpReport(sendingUid)
+                    startConsumptionReportTimer(sendingUid)
 
                     // Trigger the playback by providing all available entry points
                     val msgResponse: Message = Message.obtain(
@@ -266,7 +269,7 @@ class MediaSessionHandlerMessengerService() : Service() {
 
         /**
          * Reset a client session once a new playback session is started. Remove the ServiceAccessInformation
-         * for the corresponding client id and reset all metric reporting timers.
+         * for the corresponding client id and reset all metric/comsumption reporting timers.
          *
          * @param clientId
          */
@@ -276,6 +279,8 @@ class MediaSessionHandlerMessengerService() : Service() {
                 clientsSessionData[clientId]?.serviceAccessInformation = null
                 clientsSessionData[clientId]?.serviceAccessInformationRequestTimer?.cancel()
                 clientsSessionData[clientId]?.serviceAccessInformationRequestTimer = null
+                clientsSessionData[clientId]?.consumptionReportingTimer?.cancel()
+                clientsSessionData[clientId]?.consumptionReportingTimer = null
                 clientsSessionData[clientId]?.serviceAccessInformationResponseHeaders = null
             }
         }
@@ -327,7 +332,7 @@ class MediaSessionHandlerMessengerService() : Service() {
             return false
         }
 
-        // validate samplePercentage in ServiceAccessInformation.clientConsumptionReportingConfiguration
+        // check if the samplePercentage in ServiceAccessInformation.clientConsumptionReportingConfiguration is valid
         var samplePercentage: Float =  clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.samplePercentage;
         if(samplePercentage > SamplePercentageMax || samplePercentage < 0)
         {
@@ -335,13 +340,14 @@ class MediaSessionHandlerMessengerService() : Service() {
             return false;
         }
 
-        // if samplePercentage == 100, always report
+        // if samplePercentage is 100, MSH shall activate the consumption reporting procedure
         if(abs(SamplePercentageMax - samplePercentage) < EPSILON)
         {
             Log.i(TAG, "[ConsumptionReporting] SamplePercentage==SamplePercentageMax, always report")
             return true;
         }
 
+        // if the generated random number is of a lower value than the samplePercentage value
         val randomFloat:Float     = Random.nextFloat()
         val randomInt:Int         = Random.nextInt(0, SamplePercentageMax.toInt())
         val randomValue:Float     = randomInt - 1 + randomFloat
@@ -359,7 +365,7 @@ class MediaSessionHandlerMessengerService() : Service() {
         if (!isConsumptionReportingActivated(clientId))
         {
             Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated is 【FALSE】")
-            return false;
+            return false
         }
 
         // Condition 1/2: Start/stop of consumption of a downlink streaming session
@@ -367,17 +373,23 @@ class MediaSessionHandlerMessengerService() : Service() {
         //// to check, need return
 
         // Condition 3: check clientConsumptionReportingConfiguration.reportingInterval, timer trigger
-        // In Media Stream handler, reportConsumptionTimer()
-        //// to check, need return
+        if (clientsSessionData[clientId]!!.isConsumptionReport)
+        {
+            Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated: report triggered by timer v2")
+
+            clientsSessionData[clientId]!!.isConsumptionReport = false
+            return true
+        }
 
         // Condition 4/5:check clientConsumptionReportingConfiguration.locationReporting and clientConsumptionReportingConfiguration.accessReporting
         if(clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.locationReporting
             || clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.accessReporting)
         {
-             return true;
+            Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated: report triggered by locationReporting/accessReporting")
+            return true
         }
 
-        return false;
+        return false
     }
 
     private fun reportConsumption(msg: Message) {
@@ -405,7 +417,7 @@ class MediaSessionHandlerMessengerService() : Service() {
         if(consumptionReportingApi == null)
         {
             Log.i(TAG, "[ConsumptionReporting] consumptionReportingApi is 【NULL】")
-            return;
+            return
         }
 
         val provisisioningSessionId: String = "2";
@@ -446,4 +458,26 @@ class MediaSessionHandlerMessengerService() : Service() {
         }
     }
 
+    fun startConsumptionReportTimer(clientId: Int) {
+        val timer = Timer()
+        clientsSessionData[clientId]?.serviceAccessInformationRequestTimer = timer
+
+        if(clientsSessionData[clientId]?.serviceAccessInformation?.clientConsumptionReportingConfiguration?.reportingInterval != null) {
+            var periodSec: UInt? =
+                clientsSessionData[clientId]?.serviceAccessInformation?.clientConsumptionReportingConfiguration!!.reportingInterval
+
+            timer.schedule(
+                object : TimerTask() {
+                    override fun run() {
+                        clientsSessionData[clientId]?.isConsumptionReport = true
+                    }
+                },
+                Date(),
+                (periodSec?.times(1000u))!!.toLong()
+            )
+        }
+
+        //// todo:  support cacheControlHeader related flow
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
index 9baf723..5b4a6b0 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
@@ -13,5 +13,7 @@ data class ClientSessionModel(
     var serviceAccessInformationApi: ServiceAccessInformationApi? = null,
     var consumptionReportingApi: ConsumptionReportingApi? = null,
     var serviceAccessInformationResponseHeaders: Headers? = null,
-    var serviceAccessInformationRequestTimer: Timer? = null
+    var serviceAccessInformationRequestTimer: Timer? = null,
+    var consumptionReportingTimer: Timer? = null,
+    var isConsumptionReport: Boolean = false
 )
\ No newline at end of file

From 00daeec9d826c9982f0320306dd3fab42b1c3932 Mon Sep 17 00:00:00 2001
From: Shilin Ding <shilding@qti.qualcomm.com>
Date: Fri, 15 Sep 2023 16:39:46 +0800
Subject: [PATCH 09/11] move PlayerStates updating trigger to MSH

---
 .../MediaSessionHandlerMessengerService.kt     | 18 +++++++++++++-----
 .../models/ClientSessionModel.kt               |  4 +++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index 9faa1bd..deb448f 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -15,6 +15,7 @@ import android.content.Intent
 import android.os.*
 import android.util.Log
 import android.widget.Toast
+import com.fivegmag.a5gmscommonlibrary.helpers.PlayerStates
 import com.fivegmag.a5gmscommonlibrary.helpers.SessionHandlerMessageTypes
 import com.fivegmag.a5gmscommonlibrary.helpers.Utils
 import com.fivegmag.a5gmscommonlibrary.models.EntryPoint
@@ -99,15 +100,17 @@ class MediaSessionHandlerMessengerService() : Service() {
         }
 
         private fun handleStatusMessage(msg: Message) {
-
+            val sendingUid = msg.sendingUid;
             val bundle: Bundle = msg.data as Bundle
             val state: String = bundle.getString("playbackState", "")
+            Log.i(TAG, "[ConsumptionReporting] playbackState updated【$state】")
             Toast.makeText(
                 applicationContext,
                 "Media Session Handler Service received state message: $state",
                 Toast.LENGTH_SHORT
             ).show()
 
+            clientsSessionData[msg.sendingUid]!!.playbackState = state
         }
 
 
@@ -368,9 +371,14 @@ class MediaSessionHandlerMessengerService() : Service() {
             return false
         }
 
-        // Condition 1/2: Start/stop of consumption of a downlink streaming session
-        // In Media Stream handler, when condition 1/2 occur, reportConsumption
-        //// to check, need return
+        // Condition 1&2: start/stop of consumption of a downlink streaming session
+        val state: String = clientsSessionData[clientId]!!.playbackState
+        if (PlayerStates.PLAYING == state || PlayerStates.ENDED == state )
+        {
+            Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated: report triggered by play status【${state}】 v2")
+            clientsSessionData[clientId]!!.playbackState = PlayerStates.UNKNOWN
+            return true
+        }
 
         // Condition 3: check clientConsumptionReportingConfiguration.reportingInterval, timer trigger
         if (clientsSessionData[clientId]!!.isConsumptionReport)
@@ -381,7 +389,7 @@ class MediaSessionHandlerMessengerService() : Service() {
             return true
         }
 
-        // Condition 4/5:check clientConsumptionReportingConfiguration.locationReporting and clientConsumptionReportingConfiguration.accessReporting
+        // Condition 4&5:check clientConsumptionReportingConfiguration.locationReporting and clientConsumptionReportingConfiguration.accessReporting
         if(clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.locationReporting
             || clientsSessionData[clientId]?.serviceAccessInformation!!.clientConsumptionReportingConfiguration.accessReporting)
         {
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
index 5b4a6b0..c4d31c6 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
@@ -1,6 +1,7 @@
 package com.fivegmag.a5gmsmediasessionhandler.models
 
 import android.os.Messenger
+import com.fivegmag.a5gmscommonlibrary.helpers.PlayerStates
 import com.fivegmag.a5gmscommonlibrary.models.ServiceAccessInformation
 import com.fivegmag.a5gmsmediasessionhandler.network.ServiceAccessInformationApi
 import com.fivegmag.a5gmsmediasessionhandler.network.ConsumptionReportingApi
@@ -15,5 +16,6 @@ data class ClientSessionModel(
     var serviceAccessInformationResponseHeaders: Headers? = null,
     var serviceAccessInformationRequestTimer: Timer? = null,
     var consumptionReportingTimer: Timer? = null,
-    var isConsumptionReport: Boolean = false
+    var isConsumptionReport: Boolean = false,
+    var playbackState: String = PlayerStates.UNKNOWN
 )
\ No newline at end of file

From 66c8df7daa2bbe83f7710e2ba5830ead8b476c34 Mon Sep 17 00:00:00 2001
From: "shilin.ding" <shilding@qti.qualcomm.com>
Date: Wed, 20 Sep 2023 16:04:16 +0800
Subject: [PATCH 10/11] 1. rename isConsumptionReport to
 isConsumptionReportByTimer 2. print real report data

---
 .../MediaSessionHandlerMessengerService.kt         | 14 +++++++++-----
 .../models/ClientSessionModel.kt                   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index deb448f..81c3ade 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -381,11 +381,11 @@ class MediaSessionHandlerMessengerService() : Service() {
         }
 
         // Condition 3: check clientConsumptionReportingConfiguration.reportingInterval, timer trigger
-        if (clientsSessionData[clientId]!!.isConsumptionReport)
+        if (clientsSessionData[clientId]!!.isConsumptionReportByTimer)
         {
             Log.i(TAG, "[ConsumptionReporting] IsConsumptionReportingActivated: report triggered by timer v2")
 
-            clientsSessionData[clientId]!!.isConsumptionReport = false
+            clientsSessionData[clientId]!!.isConsumptionReportByTimer = false
             return true
         }
 
@@ -412,14 +412,17 @@ class MediaSessionHandlerMessengerService() : Service() {
         bundle.classLoader = ConsumptionReporting::class.java.classLoader
         val dataReporting: ConsumptionReporting? = bundle.getParcelable("consumptionData")
 
-        Log.i(TAG, "[ConsumptionReporting] reportConsumption ClientId: ${dataReporting?.reportingClientId}.")
+        Log.i(TAG, "[ConsumptionReporting] reportConsumption: ClientId[${dataReporting?.reportingClientId}] , " +
+                "Entry[${dataReporting?.mediaPlayerEntry}], " +
+                "startTime[${dataReporting?.consumptionReportingUnits?.get(0)?.startTime}]," +
+                "duration[${dataReporting?.consumptionReportingUnits?.get(0)?.duration}]"
+        )
         Toast.makeText(
             applicationContext,
             "MSH recv Consumption-ID: ${dataReporting?.reportingClientId}",
             Toast.LENGTH_LONG
         ).show()
 
-
         // call m5 report consumption to AF - TS26.512 Clause 4.7.4
         val consumptionReportingApi: ConsumptionReportingApi? = clientsSessionData[sendingUid]?.consumptionReportingApi
         if(consumptionReportingApi == null)
@@ -473,11 +476,12 @@ class MediaSessionHandlerMessengerService() : Service() {
         if(clientsSessionData[clientId]?.serviceAccessInformation?.clientConsumptionReportingConfiguration?.reportingInterval != null) {
             var periodSec: UInt? =
                 clientsSessionData[clientId]?.serviceAccessInformation?.clientConsumptionReportingConfiguration!!.reportingInterval
+            Log.i(TAG, "[ConsumptionReporting] startConsumptionReportTimer periodSec: $periodSec.")
 
             timer.schedule(
                 object : TimerTask() {
                     override fun run() {
-                        clientsSessionData[clientId]?.isConsumptionReport = true
+                        clientsSessionData[clientId]?.isConsumptionReportByTimer = true
                     }
                 },
                 Date(),
diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
index c4d31c6..dbb2de5 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/models/ClientSessionModel.kt
@@ -16,6 +16,6 @@ data class ClientSessionModel(
     var serviceAccessInformationResponseHeaders: Headers? = null,
     var serviceAccessInformationRequestTimer: Timer? = null,
     var consumptionReportingTimer: Timer? = null,
-    var isConsumptionReport: Boolean = false,
+    var isConsumptionReportByTimer: Boolean = false,
     var playbackState: String = PlayerStates.UNKNOWN
 )
\ No newline at end of file

From 0b942625e05db6f26a3a8b3763f9bc57cbc6b673 Mon Sep 17 00:00:00 2001
From: "shilin.ding" <shilding@qti.qualcomm.com>
Date: Thu, 21 Sep 2023 18:15:44 +0800
Subject: [PATCH 11/11] Support get real IP addr in MSH

---
 .../MediaSessionHandlerMessengerService.kt           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
index 81c3ade..37414ad 100644
--- a/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
+++ b/app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt
@@ -415,8 +415,11 @@ class MediaSessionHandlerMessengerService() : Service() {
         Log.i(TAG, "[ConsumptionReporting] reportConsumption: ClientId[${dataReporting?.reportingClientId}] , " +
                 "Entry[${dataReporting?.mediaPlayerEntry}], " +
                 "startTime[${dataReporting?.consumptionReportingUnits?.get(0)?.startTime}]," +
-                "duration[${dataReporting?.consumptionReportingUnits?.get(0)?.duration}]"
+                "duration[${dataReporting?.consumptionReportingUnits?.get(0)?.duration}]," +
+                "ipAddr[${dataReporting?.consumptionReportingUnits?.get(0)?.mediaEndpointAddress?.ipv4Addr}/" +
+                "${dataReporting?.consumptionReportingUnits?.get(0)?.mediaEndpointAddress?.ipv6Addr}]"
         )
+
         Toast.makeText(
             applicationContext,
             "MSH recv Consumption-ID: ${dataReporting?.reportingClientId}",
@@ -466,6 +469,7 @@ class MediaSessionHandlerMessengerService() : Service() {
                 clientsSessionData[clientId]?.consumptionReportingApi = retrofit.create(ConsumptionReportingApi::class.java)
             }
         } catch (e: Exception) {
+            Log.e(TAG, "[ConsumptionReporting] onException of createRetrofitForConsumpReport")
         }
     }
 
@@ -473,7 +477,7 @@ class MediaSessionHandlerMessengerService() : Service() {
         val timer = Timer()
         clientsSessionData[clientId]?.serviceAccessInformationRequestTimer = timer
 
-        if(clientsSessionData[clientId]?.serviceAccessInformation?.clientConsumptionReportingConfiguration?.reportingInterval != null) {
+        if(clientsSessionData[clientId]?.serviceAccessInformation?.clientConsumptionReportingConfiguration?.reportingInterval != 0U) {
             var periodSec: UInt? =
                 clientsSessionData[clientId]?.serviceAccessInformation?.clientConsumptionReportingConfiguration!!.reportingInterval
             Log.i(TAG, "[ConsumptionReporting] startConsumptionReportTimer periodSec: $periodSec.")
@@ -484,8 +488,8 @@ class MediaSessionHandlerMessengerService() : Service() {
                         clientsSessionData[clientId]?.isConsumptionReportByTimer = true
                     }
                 },
-                Date(),
-                (periodSec?.times(1000u))!!.toLong()
+                0,
+                (periodSec?.times(1000U))!!.toLong()
             )
         }