Moved usage of CHIPController

Author: sharadb-amazon

examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/CastingApp.java

@@ -20,8 +20,6 @@
 import android.content.Context;
 import android.util.Log;
 import chip.appserver.ChipAppServer;
-import chip.devicecontroller.ChipDeviceController;
-import chip.devicecontroller.ChipStructs;
 import chip.platform.AndroidBleManager;
 import chip.platform.AndroidChipPlatform;
 import chip.platform.ChipMdnsCallbackImpl;
@@ -67,15 +65,6 @@ public MatterError initialize(AppParameters appParameters) {
       return MatterError.CHIP_ERROR_INCORRECT_STATE;
     }
 
-    try
-    {
-      ChipDeviceController c = new ChipDeviceController(null);
-    }
-    catch(Throwable t)
-    {
-      Log.d(TAG, "Caught: " + t);
-    }
-
     this.appParameters = appParameters;
     this.nsdManagerResolverAvailState =
         new NsdManagerServiceResolver.NsdManagerResolverAvailState();

examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterCastingPlayer.java

@@ -16,6 +16,8 @@
  */
 package com.matter.casting.core;
 
+import android.util.Log;
+
 import com.matter.casting.support.EndpointFilter;
 import java.net.InetAddress;
 import java.util.List;

examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterCastingPlayerDiscovery.java

@@ -16,9 +16,13 @@
  */
 package com.matter.casting.core;
 
+import android.util.Log;
+
 import com.matter.casting.support.MatterError;
 import java.util.List;
 
+import chip.devicecontroller.ChipDeviceController;
+
 /**
  * MatterCastingPlayerDiscovery provides an API to control Matter Casting Player discovery over
  * DNS-SD, and to collect discovery results. This class provides methods to add and remove a
@@ -34,6 +38,16 @@ public static MatterCastingPlayerDiscovery getInstance() {
     if (matterCastingPlayerDiscoveryInstance == null) {
       matterCastingPlayerDiscoveryInstance = new MatterCastingPlayerDiscovery();
     }
+
+    try
+    {
+      ChipDeviceController c = new ChipDeviceController(null);
+    }
+    catch(Throwable t)
+    {
+      Log.d(TAG, "Caught: " + t);
+    }
+    
     return matterCastingPlayerDiscoveryInstance;
   };
 

examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/RotatingDeviceIdUniqueIdProvider-JNI.cpp

@@ -84,7 +84,7 @@ MutableByteSpan * RotatingDeviceIdUniqueIdProviderJNI::Get()
     ChipLogProgress(AppServer, "RotatingDeviceIdUniqueIdProviderJNI.Get() called");
     mRotatingDeviceIdUniqueIdSpan = MutableByteSpan(mRotatingDeviceIdUniqueId);
     CHIP_ERROR err                = GetJavaByteByMethod(mGetMethod, mRotatingDeviceIdUniqueIdSpan);
-    VerifyOrReturnValue(err != CHIP_NO_ERROR, nullptr,
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
                         ChipLogError(AppServer, "Error calling GetJavaByteByMethod %" CHIP_ERROR_FORMAT, err.Format()));
     return &mRotatingDeviceIdUniqueIdSpan;
 }