diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index 35d0599fe574a7..978bc5ce8d7737 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -25,7 +25,7 @@ concurrency:
 jobs:
     zap_templates:
         name: ZAP templates generation
-        timeout-minutes: 120
+        timeout-minutes: 90
 
         runs-on: ubuntu-20.04
         container:
diff --git a/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt b/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
index 95c52a5b934c46..b7ff3c376faa3f 100644
--- a/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
+++ b/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
@@ -10,7 +10,6 @@
     {{~#if (isStrEqual constraint "hasValue")}}
       {{~! Already handled above~}}
     {{~else if (isStrEqual constraint "type")}}
-      {{~assertSameTestType (asTestType ../type ../isArray) value~}}
       VerifyOrReturn(CheckConstraintType("{{asPropertyValue context=..}}", "{{asTestType ../type ../isArray}}", "{{value}}"));
     {{~else if (isStrEqual constraint "format")}}VerifyOrReturn(CheckConstraintFormat("{{asPropertyValue context=..}}", "", "{{value}}"));
 
diff --git a/examples/tv-app/android/App/common-api/src/main/aidl/com/matter/tv/app/api/IMatterAppAgent.aidl b/examples/tv-app/android/App/common-api/src/main/aidl/com/matter/tv/app/api/IMatterAppAgent.aidl
index 930a2436fa1a2b..c7dd63667c0a71 100644
--- a/examples/tv-app/android/App/common-api/src/main/aidl/com/matter/tv/app/api/IMatterAppAgent.aidl
+++ b/examples/tv-app/android/App/common-api/src/main/aidl/com/matter/tv/app/api/IMatterAppAgent.aidl
@@ -2,7 +2,6 @@
 package com.matter.tv.app.api;
 
 import com.matter.tv.app.api.SetSupportedClustersRequest;
-import com.matter.tv.app.api.ReportAttributeChangeRequest;
 
 /*
  * To use this interface, partners should query for and bind to a service that handles the "com.matter.tv.app.api.action.MatterAppAgent" Action.
@@ -29,5 +28,5 @@ interface IMatterAppAgent {
      * @return - ReportAttributeChangeResult, returns success or error code
      */
      // TODO : replace the boolean with some kind of enumerated status field
-    boolean reportAttributeChange(in ReportAttributeChangeRequest request);
+    boolean reportAttributeChange(in int clusterId, in int attributeId);
 }
\ No newline at end of file
diff --git a/examples/tv-app/android/App/common-api/src/main/aidl/com/matter/tv/app/api/ReportAttributeChangeRequest.aidl b/examples/tv-app/android/App/common-api/src/main/aidl/com/matter/tv/app/api/ReportAttributeChangeRequest.aidl
deleted file mode 100644
index abc10066340e44..00000000000000
--- a/examples/tv-app/android/App/common-api/src/main/aidl/com/matter/tv/app/api/ReportAttributeChangeRequest.aidl
+++ /dev/null
@@ -1,12 +0,0 @@
-// ReportAttributeChangeRequest.aidl
-package com.matter.tv.app.api;
-
-parcelable ReportAttributeChangeRequest{
-
-    int clusterIdentifier;
-
-    int attributeIdentifier;
-
-    String value;
-
-}
\ No newline at end of file
diff --git a/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/Clusters.java b/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/Clusters.java
new file mode 100644
index 00000000000000..dbb80b1e884933
--- /dev/null
+++ b/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/Clusters.java
@@ -0,0 +1,28 @@
+package com.matter.tv.app.api;
+
+public class Clusters {
+  // Clusters
+  public static class MediaPlayback {
+    public static final int Id = 1286;
+
+    public static class Attributes {
+      public static final int CurrentState = 0;
+    }
+
+    public static class PlaybackStateEnum {
+      public static final int Playing = 0;
+      public static final int Paused = 1;
+      public static final int NotPlaying = 2;
+      public static final int Buffering = 3;
+    }
+  }
+
+  public static class ContentLauncher {
+    public static final int Id = 1290;
+
+    public static class Attributes {
+      public static final int AcceptHeader = 0;
+      public static final int SupportedStreamingProtocols = 1;
+    }
+  }
+}
diff --git a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/AttributeHolder.java b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/AttributeHolder.java
new file mode 100644
index 00000000000000..8e4678b9c073c5
--- /dev/null
+++ b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/AttributeHolder.java
@@ -0,0 +1,30 @@
+package com.example.contentapp;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/** Class to hold attribute values to help test attribute read and subscribe use cases. */
+public class AttributeHolder {
+  private static AttributeHolder instance = new AttributeHolder();
+  private Map<Long, Map<Long, Object>> attributeValues = new HashMap<>();
+
+  private AttributeHolder() {};
+
+  public static AttributeHolder getInstance() {
+    return instance;
+  }
+
+  public void setAttributeValue(long clusterId, long attributeId, Object value) {
+    Map<Long, Object> attributes = attributeValues.get(clusterId);
+    if (attributes == null) {
+      attributes = new HashMap<>();
+      attributeValues.put(clusterId, attributes);
+    }
+    attributes.put(attributeId, value);
+  }
+
+  public Object getAttributeValue(long clusterId, long attributeId) {
+    Map<Long, Object> attributes = attributeValues.get(clusterId);
+    return attributes.get(attributeId);
+  }
+}
diff --git a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java
index dc9b8eb26f6641..c346a5c1ea4b82 100644
--- a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java
+++ b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java
@@ -1,21 +1,121 @@
 package com.example.contentapp;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import com.example.contentapp.matter.MatterAgentClient;
+import com.matter.tv.app.api.Clusters;
+import com.matter.tv.app.api.MatterIntentConstants;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 public class MainActivity extends AppCompatActivity {
 
   private static final String TAG = "ContentAppMainActivity";
+  private static final String ATTR_PS_PLAYING = "Playback State : PLAYING";
+  private static final String ATTR_PS_PAUSED = "Playback State : PAUSED";
+  private static final String ATTR_PS_NOT_PLAYING = "Playback State : NOT_PLAYING";
+  private static final String ATTR_PS_BUFFERING = "Playback State : BUFFERING";
+  private final ExecutorService executorService = Executors.newSingleThreadExecutor();
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+
+    MatterAgentClient.initialize(getApplicationContext());
+
     setContentView(R.layout.activity_main);
-    MatterAgentClient matterAgentClient = MatterAgentClient.getInstance(getApplicationContext());
-    final ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+    Intent intent = getIntent();
+    String command = intent.getStringExtra(MatterIntentConstants.EXTRA_COMMAND_PAYLOAD);
+
+    // use the text in a TextView
+    TextView textView = (TextView) findViewById(R.id.commandTextView);
+    textView.setText("Command Payload : " + command);
+
+    Button sendMessageButton = findViewById(R.id.sendMessageButton);
+
+    sendMessageButton.setOnClickListener(
+        view -> {
+          Spinner dropdown = findViewById(R.id.spinnerAttribute);
+          String attribute = (String) dropdown.getSelectedItem();
+          switch (attribute) {
+            case ATTR_PS_PLAYING:
+              AttributeHolder.getInstance()
+                  .setAttributeValue(
+                      Clusters.MediaPlayback.Id,
+                      Clusters.MediaPlayback.Attributes.CurrentState,
+                      Clusters.MediaPlayback.PlaybackStateEnum.Playing);
+              reportAttributeChange(
+                  Clusters.MediaPlayback.Id, Clusters.MediaPlayback.Attributes.CurrentState);
+              break;
+            case ATTR_PS_PAUSED:
+              AttributeHolder.getInstance()
+                  .setAttributeValue(
+                      Clusters.MediaPlayback.Id,
+                      Clusters.MediaPlayback.Attributes.CurrentState,
+                      Clusters.MediaPlayback.PlaybackStateEnum.Paused);
+              reportAttributeChange(
+                  Clusters.MediaPlayback.Id, Clusters.MediaPlayback.Attributes.CurrentState);
+              break;
+            case ATTR_PS_BUFFERING:
+              AttributeHolder.getInstance()
+                  .setAttributeValue(
+                      Clusters.MediaPlayback.Id,
+                      Clusters.MediaPlayback.Attributes.CurrentState,
+                      Clusters.MediaPlayback.PlaybackStateEnum.Buffering);
+              reportAttributeChange(
+                  Clusters.MediaPlayback.Id, Clusters.MediaPlayback.Attributes.CurrentState);
+              break;
+            case ATTR_PS_NOT_PLAYING:
+              AttributeHolder.getInstance()
+                  .setAttributeValue(
+                      Clusters.MediaPlayback.Id,
+                      Clusters.MediaPlayback.Attributes.CurrentState,
+                      Clusters.MediaPlayback.PlaybackStateEnum.NotPlaying);
+              reportAttributeChange(
+                  Clusters.MediaPlayback.Id, Clusters.MediaPlayback.Attributes.CurrentState);
+              break;
+          }
+        });
+    Spinner dropdown = findViewById(R.id.spinnerAttribute);
+    String[] items =
+        new String[] {ATTR_PS_PLAYING, ATTR_PS_PAUSED, ATTR_PS_NOT_PLAYING, ATTR_PS_BUFFERING};
+    ArrayAdapter<String> adapter =
+        new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, items);
+    dropdown.setAdapter(adapter);
+
+    MatterAgentClient matterAgentClient = MatterAgentClient.getInstance();
     executorService.execute(matterAgentClient::reportClusters);
+
+    // Setting up attribute defaults
+    AttributeHolder.getInstance()
+        .setAttributeValue(
+            Clusters.ContentLauncher.Id,
+            Clusters.ContentLauncher.Attributes.AcceptHeader,
+            "[\"video/mp4\", \"application/x-mpegURL\", \"application/dash+xml\"]");
+    AttributeHolder.getInstance()
+        .setAttributeValue(
+            Clusters.ContentLauncher.Id,
+            Clusters.ContentLauncher.Attributes.SupportedStreamingProtocols,
+            3);
+    AttributeHolder.getInstance()
+        .setAttributeValue(
+            Clusters.MediaPlayback.Id, Clusters.MediaPlayback.Attributes.CurrentState, 2);
+  }
+
+  private void reportAttributeChange(final int clusterId, final int attributeId) {
+    executorService.execute(
+        new Runnable() {
+          @Override
+          public void run() {
+            MatterAgentClient client = MatterAgentClient.getInstance();
+            client.reportAttributeChange(clusterId, attributeId);
+          }
+        });
   }
 }
diff --git a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/matter/MatterAgentClient.java b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/matter/MatterAgentClient.java
index 36bb872c8854e3..79287e7ca08194 100644
--- a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/matter/MatterAgentClient.java
+++ b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/matter/MatterAgentClient.java
@@ -29,7 +29,7 @@ public class MatterAgentClient {
   // TODO : Introduce dependency injection
   private MatterAgentClient() {};
 
-  public static synchronized MatterAgentClient getInstance(Context context) {
+  public static synchronized void initialize(Context context) {
     if (instance == null || (instance.service == null && !instance.bound)) {
       instance = new MatterAgentClient();
       if (!instance.bindService(context)) {
@@ -39,6 +39,9 @@ public static synchronized MatterAgentClient getInstance(Context context) {
         Log.d(TAG, "Matter agent binding request successful.");
       }
     }
+  }
+
+  public static MatterAgentClient getInstance() {
     return instance;
   }
 
@@ -62,6 +65,19 @@ public void reportClusters() {
     }
   }
 
+  public void reportAttributeChange(int clusterId, int attributeId) {
+    IMatterAppAgent matterAgent = instance.getMatterAgent();
+    if (matterAgent == null) {
+      Log.e(TAG, "Matter agent not retrieved.");
+      return;
+    }
+    try {
+      matterAgent.reportAttributeChange(clusterId, attributeId);
+    } catch (RemoteException e) {
+      Log.e(TAG, "Error invoking remote method to report attribute change to Matter agent");
+    }
+  }
+
   private IMatterAppAgent getMatterAgent() {
     try {
       latch.await();
diff --git a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
index fc2e1271e61ad6..930dc63d26f43a 100644
--- a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
+++ b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
@@ -5,12 +5,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
+import com.example.contentapp.AttributeHolder;
+import com.example.contentapp.MainActivity;
 import com.matter.tv.app.api.MatterIntentConstants;
 
 public class MatterCommandReceiver extends BroadcastReceiver {
   private static final String TAG = "MatterCommandReceiver";
-  private static final int ACCEPT_HEADER = 0;
-  private static final int SUPPORTED_STREAMING_PROTOCOLS = 1;
 
   @Override
   public void onReceive(Context context, Intent intent) {
@@ -24,36 +24,41 @@ public void onReceive(Context context, Intent intent) {
     switch (intentAction) {
       case MatterIntentConstants.ACTION_MATTER_COMMAND:
         int commandId = intent.getIntExtra(MatterIntentConstants.EXTRA_COMMAND_ID, -1);
+        int clusterId = intent.getIntExtra(MatterIntentConstants.EXTRA_CLUSTER_ID, -1);
         if (commandId != -1) {
-          int clusterId = intent.getIntExtra(MatterIntentConstants.EXTRA_CLUSTER_ID, -1);
           byte[] commandPayload =
               intent.getByteArrayExtra(MatterIntentConstants.EXTRA_COMMAND_PAYLOAD);
-          Log.d(
-              TAG,
+          String command = new String(commandPayload);
+          String message =
               new StringBuilder()
                   .append("Received matter command ")
                   .append(commandId)
                   .append(" on cluster ")
                   .append(clusterId)
                   .append(" with payload : ")
-                  .append(new String(commandPayload))
-                  .toString());
+                  .append(command)
+                  .toString();
+          Log.d(TAG, message);
           String response = "{\"0\":1, \"1\":\"custom response from content app\"}";
+
+          Intent in = new Intent(context, MainActivity.class);
+          in.putExtra(MatterIntentConstants.EXTRA_COMMAND_PAYLOAD, command);
+          context.startActivity(in);
+
+          Log.d(TAG, "Started activity. Now sending response");
+
           sendResponseViaPendingIntent(context, intent, response);
         } else {
           int attributeId = intent.getIntExtra(MatterIntentConstants.EXTRA_ATTRIBUTE_ID, -1);
           String attributeAction =
               intent.getStringExtra(MatterIntentConstants.EXTRA_ATTRIBUTE_ACTION);
           if (attributeAction.equals(MatterIntentConstants.ATTRIBUTE_ACTION_READ)) {
-            String response;
-            if (attributeId == ACCEPT_HEADER) {
-              response =
-                  "{\"0\": [\"video/mp4\", \"application/x-mpegURL\", \"application/dash+xml\"] }";
-            } else if (attributeId == SUPPORTED_STREAMING_PROTOCOLS) {
-              response = "{\"1\":3}";
-            } else {
-              response = "";
-            }
+            String response =
+                "{\""
+                    + attributeId
+                    + "\":"
+                    + AttributeHolder.getInstance().getAttributeValue(clusterId, attributeId)
+                    + "}";
             sendResponseViaPendingIntent(context, intent, response);
           } else {
             Log.e(
diff --git a/examples/tv-app/android/App/content-app/src/main/res/layout/activity_main.xml b/examples/tv-app/android/App/content-app/src/main/res/layout/activity_main.xml
index 4fc244418b5fe5..dadcd97935481a 100644
--- a/examples/tv-app/android/App/content-app/src/main/res/layout/activity_main.xml
+++ b/examples/tv-app/android/App/content-app/src/main/res/layout/activity_main.xml
@@ -7,12 +7,49 @@
     tools:context=".MainActivity">
 
     <TextView
+        android:id="@+id/helloTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        android:textSize="10pt"
+        app:layout_constraintBottom_toTopOf="@+id/commandTextView"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/commandTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/helloTextView"
+        android:textSize="10pt"
+        android:text="No Command!!"
+        app:layout_constraintBottom_toTopOf="@+id/sendMessageButton"
+        app:layout_constraintTop_toBottomOf="@+id/helloTextView" />
+
+    <Spinner
+        android:id="@+id/spinnerAttribute"
+        android:layout_width="239dp"
+        android:layout_height="40dp"
+        android:background="@android:drawable/btn_dropdown"
+        android:spinnerMode="dropdown"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/sendMessageButton"
+        app:layout_constraintTop_toBottomOf="@+id/commandTextView" />
+
+
+    <Button
+        android:id="@+id/sendMessageButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/helloTextView"
+        android:text="Update"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/spinnerAttribute"
+        app:layout_constraintTop_toBottomOf="@+id/commandTextView" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="spinnerAttribute,sendMessageButton" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java
index 3b70fbe91b8942..29690a408c562f 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterCommissioningPrompter.java
@@ -5,27 +5,33 @@
 import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
+import android.content.Context;
 import android.os.Build;
 import android.util.Log;
 import android.widget.EditText;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.NotificationCompat;
+import com.matter.tv.server.service.MatterServant;
 import com.matter.tv.server.tvapp.UserPrompter;
 import com.matter.tv.server.tvapp.UserPrompterResolver;
 
 public class MatterCommissioningPrompter extends UserPrompterResolver implements UserPrompter {
 
-  private Activity activity;
+  private final Context context;
   private NotificationManager notificationManager;
   private final String CHANNEL_ID = "MatterCommissioningPrompter.CHANNEL";
   private final int SUCCESS_ID = 0;
   private final int FAIL_ID = 1;
 
-  public MatterCommissioningPrompter(Activity activity) {
-    this.activity = activity;
+  public MatterCommissioningPrompter(Context context) {
+    this.context = context;
     this.createNotificationChannel();
   }
 
+  private Activity getActivity() {
+    return MatterServant.get().getActivity();
+  }
+
   public void promptForCommissionOkPermission(
       int vendorId, int productId, String commissioneeName) {
     // TODO: find app by vendorId and productId
@@ -37,7 +43,7 @@ public void promptForCommissionOkPermission(
             + productId
             + ". Commissionee: "
             + commissioneeName);
-    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
     builder
         .setMessage(commissioneeName + " is requesting permission to cast to this device, approve?")
@@ -67,8 +73,8 @@ public void promptForCommissionPinCode(int vendorId, int productId, String commi
             + productId
             + ". Commissionee: "
             + commissioneeName);
-    EditText editText = new EditText(activity);
-    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+    EditText editText = new EditText(getActivity());
+    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
     builder
         .setMessage("Please enter PIN displayed in casting app.")
@@ -99,7 +105,7 @@ public void promptCommissioningSucceeded(int vendorId, int productId, String com
             + ". Commissionee: "
             + commissioneeName);
     NotificationCompat.Builder builder =
-        new NotificationCompat.Builder(activity, CHANNEL_ID)
+        new NotificationCompat.Builder(getActivity(), CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_baseline_check_24)
             .setContentTitle("Connection Complete")
             .setContentText(
@@ -114,7 +120,7 @@ public void promptCommissioningSucceeded(int vendorId, int productId, String com
   public void promptCommissioningFailed(String commissioneeName, String error) {
     Log.d(TAG, "Received prompt for failure Commissionee: " + commissioneeName);
     NotificationCompat.Builder builder =
-        new NotificationCompat.Builder(activity, CHANNEL_ID)
+        new NotificationCompat.Builder(getActivity(), CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_baseline_clear_24)
             .setContentTitle("Connection Failed")
             .setContentText("Failed. " + commissioneeName + " experienced error: " + error + ".")
@@ -134,7 +140,7 @@ private void createNotificationChannel() {
       channel.setDescription(description);
       // Register the channel with the system; you can't change the importance
       // or other notification behaviors after this
-      this.notificationManager = getSystemService(activity, NotificationManager.class);
+      this.notificationManager = getSystemService(context, NotificationManager.class);
       notificationManager.createNotificationChannel(channel);
     }
   }
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/ContentAppFragment.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/ContentAppFragment.java
index 8ffbd0e6349d39..10a9d269de320c 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/ContentAppFragment.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/ContentAppFragment.java
@@ -119,7 +119,7 @@ public void onReceive(Context context, Intent intent) {
               adapter.addAll(
                   ContentAppDiscoveryService.getReceiverInstance()
                       .getDiscoveredContentApps()
-                      .entrySet());
+                      .keySet());
               adapter.notifyDataSetChanged();
             }
           }
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/model/ContentApp.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/model/ContentApp.java
index 5d021c198f5830..7dd5f112cc8855 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/model/ContentApp.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/model/ContentApp.java
@@ -2,16 +2,20 @@
 
 import com.matter.tv.app.api.SupportedCluster;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class ContentApp {
 
+  public static final int INVALID_ENDPOINTID = -1;
   private String appName;
   private String vendorName;
   private int vendorId;
   private int productId;
   private Set<SupportedCluster> supportedClusters;
-  private int endpoint;
+  // initially set to an invalid value.
+  private int endpoint = INVALID_ENDPOINTID;
 
   public ContentApp(
       String appName,
@@ -53,4 +57,8 @@ public void setEndpointId(int endpoint) {
   public Set<SupportedCluster> getSupportedClusters() {
     return Collections.unmodifiableSet(supportedClusters);
   }
+
+  public void setSupportedClusters(List<SupportedCluster> supportedClusters) {
+    this.supportedClusters = new HashSet<>(supportedClusters);
+  }
 }
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java
index faaa3247320186..a841fece436bff 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java
@@ -49,6 +49,10 @@ public class AppPlatformService {
 
   private AppPlatformService() {}
 
+  public void reportAttributeChange(int endpointId, int clusterId, int attributeId) {
+    mAppPlatform.reportAttributeChange(endpointId, clusterId, attributeId);
+  }
+
   private static class SingletonHolder {
     static AppPlatformService instance = new AppPlatformService();
   }
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ContentAppAgentService.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ContentAppAgentService.java
index d68758b1152816..6fdfa6a0b3ff5e 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ContentAppAgentService.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/ContentAppAgentService.java
@@ -4,6 +4,7 @@
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
@@ -11,6 +12,8 @@
 import androidx.annotation.Nullable;
 import com.matter.tv.app.api.IMatterAppAgent;
 import com.matter.tv.app.api.MatterIntentConstants;
+import com.matter.tv.server.model.ContentApp;
+import com.matter.tv.server.receivers.ContentAppDiscoveryService;
 import java.util.concurrent.TimeUnit;
 
 public class ContentAppAgentService extends Service {
@@ -28,17 +31,43 @@ public class ContentAppAgentService extends Service {
         @Override
         public boolean setSupportedClusters(
             com.matter.tv.app.api.SetSupportedClustersRequest request) throws RemoteException {
+          final int callingUID = Binder.getCallingUid();
+          final String pkg = getApplicationContext().getPackageManager().getNameForUid(callingUID);
           Log.d(
               TAG,
               "Received request to add the following supported clusters "
-                  + request.supportedClusters.toString());
-          // TODO : need to (re)discover the app with the new clusters.
-          return true;
+                  + request.supportedClusters.toString()
+                  + " for app "
+                  + pkg);
+          ContentApp contentApp =
+              ContentAppDiscoveryService.getReceiverInstance().getDiscoveredContentApp(pkg);
+          if (contentApp != null) {
+            contentApp.setSupportedClusters(request.supportedClusters);
+            return true;
+          }
+          Log.e(TAG, "No matter content app found for package " + pkg);
+          return false;
         }
 
         @Override
-        public boolean reportAttributeChange(
-            com.matter.tv.app.api.ReportAttributeChangeRequest request) throws RemoteException {
+        public boolean reportAttributeChange(int clusterId, int attributeId)
+            throws RemoteException {
+          final int callingUID = Binder.getCallingUid();
+          final String pkg = getApplicationContext().getPackageManager().getNameForUid(callingUID);
+          Log.d(
+              TAG,
+              "Received request to report attribute change for cluster "
+                  + clusterId
+                  + " attribute "
+                  + attributeId);
+          ContentApp contentApp =
+              ContentAppDiscoveryService.getReceiverInstance().getDiscoveredContentApp(pkg);
+          if (contentApp != null && contentApp.getEndpointId() != ContentApp.INVALID_ENDPOINTID) {
+            AppPlatformService.get()
+                .reportAttributeChange(contentApp.getEndpointId(), clusterId, attributeId);
+            return true;
+          }
+          Log.e(TAG, "No matter content app found for package " + pkg);
           return false;
         }
       };
@@ -108,7 +137,7 @@ public static String sendAttributeReadRequest(
   }
 
   private static PendingIntent getPendingIntentForResponse(
-      final Context context, final String targetPackage, final int responseId) {
+      Context context, final String targetPackage, final int responseId) {
     Intent ackBackIntent = new Intent(ACTION_MATTER_RESPONSE);
     ackBackIntent.setClass(context, ContentAppAgentService.class);
     ackBackIntent.putExtra(EXTRA_RESPONSE_RECEIVING_PACKAGE, targetPackage);
diff --git a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
index a2d06c64ee07ce..00963fa1f7e2ae 100644
--- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
@@ -144,7 +144,7 @@ public void onCommissioningComplete() {
   }
 
   public void initCommissioner() {
-    mTvApp.initializeCommissioner(new MatterCommissioningPrompter(activity));
+    mTvApp.initializeCommissioner(new MatterCommissioningPrompter(context));
   }
 
   public void restart() {
@@ -161,6 +161,10 @@ public void setActivity(Activity activity) {
     this.activity = activity;
   }
 
+  public Activity getActivity() {
+    return activity;
+  }
+
   public void sendCustomCommand(String customCommand) {
     Log.i(MatterServant.class.getName(), customCommand);
     // TODO: insert logic ot send custom command here
diff --git a/examples/tv-app/android/App/platform-app/src/main/res/layout/applist_item.xml b/examples/tv-app/android/App/platform-app/src/main/res/layout/applist_item.xml
index 678d76814268a5..214ae3d4ea4c45 100644
--- a/examples/tv-app/android/App/platform-app/src/main/res/layout/applist_item.xml
+++ b/examples/tv-app/android/App/platform-app/src/main/res/layout/applist_item.xml
@@ -7,12 +7,7 @@
         android:id="@+id/appNameTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="10pt"
         android:text="TextView" />
 
-    <Button
-        android:id="@+id/sendMessageButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Button"
-        android:layout_toEndOf="@id/appNameTextView" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/examples/tv-app/android/BUILD.gn b/examples/tv-app/android/BUILD.gn
index 9ec4f866429765..9d4993c89e2d2d 100644
--- a/examples/tv-app/android/BUILD.gn
+++ b/examples/tv-app/android/BUILD.gn
@@ -35,6 +35,8 @@ shared_library("jni") {
     "include/cluster-init.cpp",
     "include/content-launcher/AppContentLauncherManager.cpp",
     "include/content-launcher/AppContentLauncherManager.h",
+    "include/media-playback/AppMediaPlaybackManager.cpp",
+    "include/media-playback/AppMediaPlaybackManager.h",
     "include/target-navigator/TargetNavigatorManager.cpp",
     "include/target-navigator/TargetNavigatorManager.h",
     "java/AppImpl.cpp",
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
index d898612977983a..801dfe7698b4fd 100644
--- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
+++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
@@ -27,7 +27,7 @@ using namespace chip::app::DataModel;
 using namespace chip::app::Clusters::ContentLauncher;
 using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate;
 
-AppContentLauncherManager::AppContentLauncherManager(ContentAppAttributeDelegate attributeDelegate,
+AppContentLauncherManager::AppContentLauncherManager(ContentAppAttributeDelegate * attributeDelegate,
                                                      list<std::string> acceptHeaderList, uint32_t supportedStreamingProtocols) :
     mAttributeDelegate(attributeDelegate)
 {
@@ -85,7 +85,7 @@ CHIP_ERROR AppContentLauncherManager::HandleGetAcceptHeaderList(AttributeValueEn
     ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList");
     chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::ContentLauncher::Id,
                                                chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::Id);
-    const char * resStr = mAttributeDelegate.Read(aPath);
+    const char * resStr = mAttributeDelegate->Read(aPath);
     ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr);
 
     if (resStr != nullptr && *resStr != 0)
@@ -124,7 +124,7 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols()
     ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols");
     chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::ContentLauncher::Id,
                                                chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id);
-    const char * resStr = mAttributeDelegate.Read(aPath);
+    const char * resStr = mAttributeDelegate->Read(aPath);
     ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr);
 
     if (resStr == nullptr || *resStr == 0)
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
index bcce3add47f4a7..cee210910dcbe4 100644
--- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
+++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.h
@@ -35,7 +35,7 @@ using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelega
 class AppContentLauncherManager : public ContentLauncherDelegate
 {
 public:
-    AppContentLauncherManager(ContentAppAttributeDelegate attributeDelegate, std::list<std::string> acceptHeaderList,
+    AppContentLauncherManager(ContentAppAttributeDelegate * attributeDelegate, std::list<std::string> acceptHeaderList,
                               uint32_t supportedStreamingProtocols);
 
     void HandleLaunchContent(CommandResponseHelper<LaunchResponseType> & helper,
@@ -60,5 +60,5 @@ class AppContentLauncherManager : public ContentLauncherDelegate
     // TODO: set this based upon meta data from app
     uint32_t mDynamicEndpointFeatureMap = 3;
 
-    ContentAppAttributeDelegate mAttributeDelegate;
+    ContentAppAttributeDelegate * mAttributeDelegate;
 };
diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
new file mode 100644
index 00000000000000..8e47b3126fa7de
--- /dev/null
+++ b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
@@ -0,0 +1,221 @@
+/**
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppMediaPlaybackManager.h"
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <cstdint>
+#include <jni.h>
+#include <json/json.h>
+#include <lib/support/CHIPJNIError.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
+
+using namespace std;
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::DataModel;
+using namespace chip::app::Clusters::MediaPlayback;
+using namespace chip::Uint8;
+using chip::CharSpan;
+
+AppMediaPlaybackManager::AppMediaPlaybackManager(ContentAppAttributeDelegate * attributeDelegate) :
+    mAttributeDelegate(attributeDelegate){};
+
+PlaybackStateEnum AppMediaPlaybackManager::HandleGetCurrentState()
+{
+    uint64_t ret = HandleMediaRequestGetAttribute(MEDIA_PLAYBACK_ATTRIBUTE_PLAYBACK_STATE);
+    return static_cast<PlaybackStateEnum>(ret);
+}
+
+uint64_t AppMediaPlaybackManager::HandleGetStartTime()
+{
+    return HandleMediaRequestGetAttribute(MEDIA_PLAYBACK_ATTRIBUTE_START_TIME);
+}
+
+uint64_t AppMediaPlaybackManager::HandleGetDuration()
+{
+    return HandleMediaRequestGetAttribute(MEDIA_PLAYBACK_ATTRIBUTE_DURATION);
+}
+
+float AppMediaPlaybackManager::HandleGetPlaybackSpeed()
+{
+    uint64_t ret = HandleMediaRequestGetAttribute(MEDIA_PLAYBACK_ATTRIBUTE_SPEED);
+    return static_cast<float>(ret) / 10000.0f;
+}
+
+uint64_t AppMediaPlaybackManager::HandleGetSeekRangeStart()
+{
+    return HandleMediaRequestGetAttribute(MEDIA_PLAYBACK_ATTRIBUTE_SEEK_RANGE_START);
+}
+
+uint64_t AppMediaPlaybackManager::HandleGetSeekRangeEnd()
+{
+    return HandleMediaRequestGetAttribute(MEDIA_PLAYBACK_ATTRIBUTE_SEEK_RANGE_END);
+}
+
+void AppMediaPlaybackManager::HandlePlay(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_PLAY, 0));
+}
+
+void AppMediaPlaybackManager::HandlePause(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_PAUSE, 0));
+}
+
+void AppMediaPlaybackManager::HandleStop(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_STOP, 0));
+}
+
+void AppMediaPlaybackManager::HandleFastForward(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_FAST_FORWARD, 0));
+}
+
+void AppMediaPlaybackManager::HandlePrevious(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_PREVIOUS, 0));
+}
+
+void AppMediaPlaybackManager::HandleRewind(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_REWIND, 0));
+}
+
+void AppMediaPlaybackManager::HandleSkipBackward(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper,
+                                                 const uint64_t & deltaPositionMilliseconds)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_SKIP_BACKWARD, deltaPositionMilliseconds));
+}
+
+void AppMediaPlaybackManager::HandleSkipForward(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper,
+                                                const uint64_t & deltaPositionMilliseconds)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_SKIP_FORWARD, deltaPositionMilliseconds));
+}
+
+void AppMediaPlaybackManager::HandleSeek(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper,
+                                         const uint64_t & positionMilliseconds)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_SEEK, positionMilliseconds));
+}
+
+void AppMediaPlaybackManager::HandleNext(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_NEXT, 0));
+}
+
+void AppMediaPlaybackManager::HandleStartOver(CommandResponseHelper<Commands::PlaybackResponse::Type> & helper)
+{
+    helper.Success(HandleMediaRequest(MEDIA_PLAYBACK_REQUEST_START_OVER, 0));
+}
+
+uint64_t AppMediaPlaybackManager::HandleMediaRequestGetAttribute(chip::AttributeId attributeId)
+{
+    ChipLogProgress(Zcl, "Received AppMediaPlaybackManager::HandleMediaRequestGetAttribute:%d", attributeId);
+    chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::MediaPlayback::Id, attributeId);
+    const char * resStr = mAttributeDelegate->Read(aPath);
+    ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute response %s", resStr);
+
+    uint64_t ret = std::numeric_limits<uint64_t>::max();
+    if (resStr != nullptr && *resStr != 0)
+    {
+        Json::Reader reader;
+        Json::Value value;
+        if (reader.parse(resStr, value))
+        {
+            std::string attrId = to_string(attributeId);
+            ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute response parsing done. reading attr %s",
+                            attrId.c_str());
+            if (!value[attrId].empty())
+            {
+                ret = static_cast<uint64_t>(value[attrId].asUInt());
+                return ret;
+            }
+            ChipLogError(Zcl,
+                         "AppMediaPlaybackManager::HandleMediaRequestGetAttribute error. Invalid response from the content app.");
+            return ret;
+        }
+    }
+    ChipLogError(
+        Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute error. Did not get a response back from the content app.");
+    return ret;
+}
+
+Commands::PlaybackResponse::Type AppMediaPlaybackManager::HandleMediaRequest(MediaPlaybackRequest mediaPlaybackRequest,
+                                                                             uint64_t deltaPositionMilliseconds)
+{
+    // Ideally should not come here
+    ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequest");
+    Commands::PlaybackResponse::Type response;
+    response.status = MediaPlaybackStatusEnum::kInvalidStateForCommand;
+    return response;
+}
+
+CHIP_ERROR AppMediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncoder & aEncoder)
+{
+    Structs::PlaybackPosition::Type response;
+    response.updatedAt = 0;
+    response.position  = Nullable<uint64_t>(0);
+
+    ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleGetSampledPosition");
+    chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::MediaPlayback::Id,
+                                               chip::app::Clusters::MediaPlayback::Attributes::SampledPosition::Id);
+    const char * resStr = mAttributeDelegate->Read(aPath);
+
+    if (resStr != nullptr && *resStr != 0)
+    {
+        Json::Reader reader;
+        Json::Value value;
+        if (reader.parse(resStr, value))
+        {
+            std::string attrId = to_string(chip::app::Clusters::MediaPlayback::Attributes::SampledPosition::Id);
+            ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSampledPosition response parsing done. reading attr %s",
+                            attrId.c_str());
+            if (!value[attrId].empty())
+            {
+                std::string updatedAt = to_string(
+                    static_cast<uint32_t>(chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Fields::kUpdatedAt));
+                std::string position = to_string(
+                    static_cast<uint32_t>(chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Fields::kPosition));
+                if (!value[attrId][updatedAt].empty() && !value[attrId][position].empty())
+                {
+                    // valid response
+                    response.updatedAt = value[attrId][updatedAt].asUInt();
+                    response.position  = Nullable<uint64_t>(value[attrId][position].asUInt());
+                    return aEncoder.Encode(response);
+                }
+            }
+        }
+    }
+    ChipLogError(Zcl, "AppMediaPlaybackManager::GetAttribute error. Invalid response from the content app.");
+    return aEncoder.Encode(response);
+}
+
+uint32_t AppMediaPlaybackManager::GetFeatureMap(chip::EndpointId endpoint)
+{
+    if (endpoint >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT)
+    {
+        return mDynamicEndpointFeatureMap;
+    }
+
+    uint32_t featureMap = 0;
+    Attributes::FeatureMap::Get(endpoint, &featureMap);
+    return featureMap;
+}
diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h
new file mode 100644
index 00000000000000..87bbc9a7765dd4
--- /dev/null
+++ b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.h
@@ -0,0 +1,101 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "../../java/ContentAppAttributeDelegate.h"
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app/clusters/media-playback-server/media-playback-server.h>
+#include <cstdint>
+#include <jni.h>
+
+enum MediaPlaybackRequestAttribute : chip::AttributeId
+{
+    MEDIA_PLAYBACK_ATTRIBUTE_PLAYBACK_STATE   = chip::app::Clusters::MediaPlayback::Attributes::CurrentState::Id,
+    MEDIA_PLAYBACK_ATTRIBUTE_START_TIME       = chip::app::Clusters::MediaPlayback::Attributes::StartTime::Id,
+    MEDIA_PLAYBACK_ATTRIBUTE_DURATION         = chip::app::Clusters::MediaPlayback::Attributes::Duration::Id,
+    MEDIA_PLAYBACK_ATTRIBUTE_SPEED            = chip::app::Clusters::MediaPlayback::Attributes::PlaybackSpeed::Id,
+    MEDIA_PLAYBACK_ATTRIBUTE_SEEK_RANGE_END   = chip::app::Clusters::MediaPlayback::Attributes::SeekRangeEnd::Id,
+    MEDIA_PLAYBACK_ATTRIBUTE_SEEK_RANGE_START = chip::app::Clusters::MediaPlayback::Attributes::SeekRangeStart::Id,
+};
+
+enum MediaPlaybackRequest : uint8_t
+{
+    MEDIA_PLAYBACK_REQUEST_PLAY          = 0,
+    MEDIA_PLAYBACK_REQUEST_PAUSE         = 1,
+    MEDIA_PLAYBACK_REQUEST_STOP          = 2,
+    MEDIA_PLAYBACK_REQUEST_START_OVER    = 3,
+    MEDIA_PLAYBACK_REQUEST_PREVIOUS      = 4,
+    MEDIA_PLAYBACK_REQUEST_NEXT          = 5,
+    MEDIA_PLAYBACK_REQUEST_REWIND        = 6,
+    MEDIA_PLAYBACK_REQUEST_FAST_FORWARD  = 7,
+    MEDIA_PLAYBACK_REQUEST_SKIP_FORWARD  = 8,
+    MEDIA_PLAYBACK_REQUEST_SKIP_BACKWARD = 9,
+    MEDIA_PLAYBACK_REQUEST_SEEK          = 10,
+};
+
+using chip::EndpointId;
+using chip::app::AttributeValueEncoder;
+using chip::app::CommandResponseHelper;
+using MediaPlaybackDelegate       = chip::app::Clusters::MediaPlayback::Delegate;
+using PlaybackResponseType        = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type;
+using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate;
+
+class AppMediaPlaybackManager : public MediaPlaybackDelegate
+{
+public:
+    AppMediaPlaybackManager(ContentAppAttributeDelegate * attributeDelegate);
+
+    chip::app::Clusters::MediaPlayback::PlaybackStateEnum HandleGetCurrentState() override;
+    uint64_t HandleGetStartTime() override;
+    uint64_t HandleGetDuration() override;
+    CHIP_ERROR HandleGetSampledPosition(AttributeValueEncoder & aEncoder) override;
+    float HandleGetPlaybackSpeed() override;
+    uint64_t HandleGetSeekRangeStart() override;
+    uint64_t HandleGetSeekRangeEnd() override;
+
+    void HandlePlay(CommandResponseHelper<PlaybackResponseType> & helper) override;
+    void HandlePause(CommandResponseHelper<PlaybackResponseType> & helper) override;
+    void HandleStop(CommandResponseHelper<PlaybackResponseType> & helper) override;
+    void HandleFastForward(CommandResponseHelper<PlaybackResponseType> & helper) override;
+    void HandlePrevious(CommandResponseHelper<PlaybackResponseType> & helper) override;
+    void HandleRewind(CommandResponseHelper<PlaybackResponseType> & helper) override;
+    void HandleSkipBackward(CommandResponseHelper<PlaybackResponseType> & helper,
+                            const uint64_t & deltaPositionMilliseconds) override;
+    void HandleSkipForward(CommandResponseHelper<PlaybackResponseType> & helper,
+                           const uint64_t & deltaPositionMilliseconds) override;
+    void HandleSeek(CommandResponseHelper<PlaybackResponseType> & helper, const uint64_t & positionMilliseconds) override;
+    void HandleNext(CommandResponseHelper<PlaybackResponseType> & helper) override;
+    void HandleStartOver(CommandResponseHelper<PlaybackResponseType> & helper) override;
+
+    uint32_t GetFeatureMap(chip::EndpointId endpoint) override;
+
+    void SetEndpointId(EndpointId epId) { mEndpointId = epId; };
+
+private:
+    uint64_t HandleMediaRequestGetAttribute(chip::AttributeId attribute);
+    chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type
+    HandleMediaRequest(MediaPlaybackRequest mediaPlaybackRequest, uint64_t deltaPositionMilliseconds);
+
+    EndpointId mEndpointId;
+
+    // TODO: set this based upon meta data from app
+    uint32_t mDynamicEndpointFeatureMap = 3;
+
+    ContentAppAttributeDelegate * mAttributeDelegate;
+};
diff --git a/examples/tv-app/android/java/AppImpl.cpp b/examples/tv-app/android/java/AppImpl.cpp
index 9c9ed3c9d67a9f..57418ebeb6c724 100644
--- a/examples/tv-app/android/java/AppImpl.cpp
+++ b/examples/tv-app/android/java/AppImpl.cpp
@@ -21,6 +21,7 @@
 
 #include "AppImpl.h"
 
+#include "ContentAppAttributeDelegate.h"
 #include "ContentAppCommandDelegate.h"
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/cluster-id.h>
@@ -28,6 +29,7 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/InteractionModelEngine.h>
+#include <app/reporting/reporting.h>
 #include <app/server/Dnssd.h>
 #include <app/server/Server.h>
 #include <app/util/af.h>
@@ -260,6 +262,11 @@ uint16_t ContentAppFactoryImpl::GetPlatformCatalogVendorId()
     return kCatalogVendorId;
 }
 
+void ContentAppFactoryImpl::setContentAppAttributeDelegate(ContentAppAttributeDelegate * attributeDelegate)
+{
+    mAttributeDelegate = attributeDelegate;
+}
+
 CHIP_ERROR ContentAppFactoryImpl::LookupCatalogVendorApp(uint16_t vendorId, uint16_t productId, CatalogVendorApp * destinationApp)
 {
     std::string appId               = BuildAppId(vendorId);
@@ -323,9 +330,9 @@ EndpointId ContentAppFactoryImpl::AddContentApp(const char * szVendorName, uint1
                                                 uint16_t productId, const char * szApplicationVersion, jobject manager)
 {
     DataVersion * dataVersionBuf = new DataVersion[ArraySize(contentAppClusters)];
-    ContentAppImpl * app =
-        new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion, "20202021", manager);
-    EndpointId epId = ContentAppPlatform::GetInstance().AddContentApp(
+    ContentAppImpl * app         = new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion,
+                                              "20202021", mAttributeDelegate);
+    EndpointId epId              = ContentAppPlatform::GetInstance().AddContentApp(
         app, &contentAppEndpoint, Span<DataVersion>(dataVersionBuf, ArraySize(contentAppClusters)),
         Span<const EmberAfDeviceType>(gContentAppDeviceType));
     ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl AddContentApp endpoint returned %d. Endpoint set %d", epId,
@@ -340,9 +347,9 @@ EndpointId ContentAppFactoryImpl::AddContentApp(const char * szVendorName, uint1
                                                 EndpointId desiredEndpointId)
 {
     DataVersion * dataVersionBuf = new DataVersion[ArraySize(contentAppClusters)];
-    ContentAppImpl * app =
-        new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion, "20202021", manager);
-    EndpointId epId = ContentAppPlatform::GetInstance().AddContentApp(
+    ContentAppImpl * app         = new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion,
+                                              "20202021", mAttributeDelegate);
+    EndpointId epId              = ContentAppPlatform::GetInstance().AddContentApp(
         app, &contentAppEndpoint, Span<DataVersion>(dataVersionBuf, ArraySize(contentAppClusters)),
         Span<const EmberAfDeviceType>(gContentAppDeviceType), desiredEndpointId);
     ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl AddContentApp endpoint returned %d. Endpoint set %d", epId,
@@ -406,6 +413,7 @@ CHIP_ERROR InitVideoPlayerPlatform(jobject contentAppEndpointManager)
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
     ContentAppPlatform::GetInstance().SetupAppPlatform();
     ContentAppPlatform::GetInstance().SetContentAppFactory(&gFactory);
+    gFactory.setContentAppAttributeDelegate(new ContentAppAttributeDelegate(contentAppEndpointManager));
 
     ChipLogProgress(AppServer, "Starting registration of command handler delegates");
     for (size_t i = 0; i < ArraySize(contentAppClusters); i++)
@@ -453,3 +461,8 @@ EndpointId RemoveContentApp(EndpointId epId)
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
     return kInvalidEndpointId;
 }
+
+void ReportAttributeChange(EndpointId epId, chip::ClusterId clusterId, chip::AttributeId attributeId)
+{
+    MatterReportingAttributeChangeCallback(epId, clusterId, attributeId);
+}
diff --git a/examples/tv-app/android/java/AppImpl.h b/examples/tv-app/android/java/AppImpl.h
index d49ff78f622c54..e86a750cc533c4 100644
--- a/examples/tv-app/android/java/AppImpl.h
+++ b/examples/tv-app/android/java/AppImpl.h
@@ -37,13 +37,12 @@
 #include "../include/application-basic/ApplicationBasicManager.h"
 #include "../include/application-launcher/ApplicationLauncherManager.h"
 #include "../include/content-launcher/AppContentLauncherManager.h"
+#include "../include/media-playback/AppMediaPlaybackManager.h"
 #include "../include/target-navigator/TargetNavigatorManager.h"
 #include "ChannelManager.h"
 #include "CommissionerMain.h"
 #include "ContentAppAttributeDelegate.h"
 #include "KeypadInputManager.h"
-#include "MediaPlaybackManager.h"
-#include "MyUserPrompter-JNI.h"
 #include <app/clusters/account-login-server/account-login-delegate.h>
 #include <app/clusters/application-basic-server/application-basic-delegate.h>
 #include <app/clusters/application-launcher-server/application-launcher-delegate.h>
@@ -59,6 +58,7 @@ EndpointId AddContentApp(const char * szVendorName, uint16_t vendorId, const cha
 EndpointId AddContentApp(const char * szVendorName, uint16_t vendorId, const char * szApplicationName, uint16_t productId,
                          const char * szApplicationVersion, EndpointId endpointId, jobject manager);
 EndpointId RemoveContentApp(EndpointId epId);
+void ReportAttributeChange(EndpointId epId, chip::ClusterId clusterId, chip::AttributeId attributeId);
 
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 
@@ -85,13 +85,13 @@ class DLL_EXPORT ContentAppImpl : public ContentApp
 {
 public:
     ContentAppImpl(const char * szVendorName, uint16_t vendorId, const char * szApplicationName, uint16_t productId,
-                   const char * szApplicationVersion, const char * setupPIN, jobject manager) :
+                   const char * szApplicationVersion, const char * setupPIN, ContentAppAttributeDelegate * attributeDelegate) :
         mApplicationBasicDelegate(kCatalogVendorId, BuildAppId(vendorId), szVendorName, vendorId, szApplicationName, productId,
                                   szApplicationVersion),
-        mAccountLoginDelegate(setupPIN), mContentLauncherDelegate(ContentAppAttributeDelegate(manager), { "image/*", "video/*" },
+        mAccountLoginDelegate(setupPIN), mContentLauncherDelegate(attributeDelegate, { "image/*", "video/*" },
                                                                   to_underlying(SupportedStreamingProtocol::kDash) |
                                                                       to_underlying(SupportedStreamingProtocol::kHls)),
-        mTargetNavigatorDelegate({ "home", "search", "info", "guide", "menu" }, 0){};
+        mMediaPlaybackDelegate(attributeDelegate), mTargetNavigatorDelegate({ "home", "search", "info", "guide", "menu" }, 0){};
     virtual ~ContentAppImpl() {}
 
     AccountLoginDelegate * GetAccountLoginDelegate() override { return &mAccountLoginDelegate; };
@@ -104,7 +104,11 @@ class DLL_EXPORT ContentAppImpl : public ContentApp
         return &mContentLauncherDelegate;
     };
     KeypadInputDelegate * GetKeypadInputDelegate() override { return &mKeypadInputDelegate; };
-    MediaPlaybackDelegate * GetMediaPlaybackDelegate() override { return &mMediaPlaybackDelegate; };
+    MediaPlaybackDelegate * GetMediaPlaybackDelegate() override
+    {
+        mMediaPlaybackDelegate.SetEndpointId(GetEndpointId());
+        return &mMediaPlaybackDelegate;
+    };
     TargetNavigatorDelegate * GetTargetNavigatorDelegate() override { return &mTargetNavigatorDelegate; };
 
 protected:
@@ -114,7 +118,7 @@ class DLL_EXPORT ContentAppImpl : public ContentApp
     ChannelManager mChannelDelegate;
     AppContentLauncherManager mContentLauncherDelegate;
     KeypadInputManager mKeypadInputDelegate;
-    MediaPlaybackManager mMediaPlaybackDelegate;
+    AppMediaPlaybackManager mMediaPlaybackDelegate;
     TargetNavigatorManager mTargetNavigatorDelegate;
 };
 
@@ -156,6 +160,8 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory
 
     void AddAdminVendorId(uint16_t vendorId);
 
+    void setContentAppAttributeDelegate(ContentAppAttributeDelegate * attributeDelegate);
+
 protected:
     std::vector<ContentAppImpl *> mContentApps{
         new ContentAppImpl("Vendor1", 1, "exampleid", 11, "Version1", "20202021", nullptr),
@@ -166,6 +172,9 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory
     std::vector<DataVersion *> mDataVersions{};
 
     std::vector<uint16_t> mAdminVendorIds{};
+
+private:
+    ContentAppAttributeDelegate * mAttributeDelegate;
 };
 
 } // namespace AppPlatform
diff --git a/examples/tv-app/android/java/AppPlatform-JNI.cpp b/examples/tv-app/android/java/AppPlatform-JNI.cpp
index 06bf01133e8f5d..3675c33852bd0f 100644
--- a/examples/tv-app/android/java/AppPlatform-JNI.cpp
+++ b/examples/tv-app/android/java/AppPlatform-JNI.cpp
@@ -18,8 +18,6 @@
 
 #include "AppImpl.h"
 
-#include "MyUserPrompter-JNI.h"
-
 #include <jni.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/CHIPJNIError.h>
@@ -81,3 +79,11 @@ JNI_METHOD(jint, removeContentApp)
     EndpointId epId = RemoveContentApp(static_cast<EndpointId>(endpointId));
     return static_cast<uint16_t>(epId);
 }
+
+JNI_METHOD(void, reportAttributeChange)
+(JNIEnv *, jobject, jint endpointId, jint clusterId, jint attributeId)
+{
+    chip::DeviceLayer::StackLock lock;
+    ReportAttributeChange(static_cast<EndpointId>(endpointId), static_cast<chip::ClusterId>(clusterId),
+                          static_cast<chip::AttributeId>(attributeId));
+}
diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/AppPlatform.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/AppPlatform.java
index 74bc5d14f2f9d5..a01a50fe253361 100644
--- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/AppPlatform.java
+++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/AppPlatform.java
@@ -52,6 +52,9 @@ public native int addContentAppAtEndpoint(
   // Method to remove content app as endpoint (happens when the app is uninstalled)
   public native int removeContentApp(int endpointId);
 
+  // Method to report attribute change for content app endpoints to the SDK
+  public native void reportAttributeChange(int endpointId, int clusterId, int attributeId);
+
   static {
     System.loadLibrary("TvApp");
   }