[BGF] For MultiProcess.java enable audio&video feature, fix a crash when Join then Leave channel.

LiuQiang · LiuQiang · commit 54843cff40d2 · 2021-10-08T17:10:04.000+08:00
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MultiProcess.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MultiProcess.java
@@ -192,7 +192,8 @@ public void onClick(View v)
                  *          triggers the removeInjectStreamUrl method.*/
                 engine.leaveChannel();
                 join.setText(getString(R.string.join));
-                mSSClient.stop(getContext());
+                if(isSharing)
+                    mSSClient.stop(getContext());
                 screenShare.setText(getResources().getString(R.string.screenshare));
                 screenShare.setEnabled(false);
                 isSharing = false;
@@ -244,9 +245,6 @@ private void joinChannel(String channelId)
         fl_local.addView(surfaceView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         // Setup local video to render your local camera preview
         engine.setupLocalVideo(new VideoCanvas(surfaceView, RENDER_MODE_HIDDEN, 0));
-        // Set audio route to microPhone
-        engine.disableAudio();
-//        engine.setDefaultAudioRoutetoSpeakerphone(false);
 
         /** Sets the channel profile of the Agora RtcEngine.
          CHANNEL_PROFILE_COMMUNICATION(0): (Default) The Communication profile.
@@ -281,8 +279,8 @@ private void joinChannel(String channelId)
          if you do not specify the uid, we will generate the uid for you*/
 
         ChannelMediaOptions option = new ChannelMediaOptions();
-        option.autoSubscribeAudio = false;
-        option.autoSubscribeVideo = false;
+        option.autoSubscribeAudio = true;
+        option.autoSubscribeVideo = true;
         int res = engine.joinChannel(accessToken, channelId, "Extra Optional Data", 0, option);
         if (res != 0)
         {
diff --git a/Android/APIExample/lib-screensharing/src/main/java/io/agora/rtc/ss/ScreenSharingClient.java b/Android/APIExample/lib-screensharing/src/main/java/io/agora/rtc/ss/ScreenSharingClient.java
@@ -35,7 +35,7 @@ public static ScreenSharingClient getInstance() {
         return mInstance;
     }
 
-    private ServiceConnection mScreenShareConn = new ServiceConnection() {
+    private final ServiceConnection mScreenShareConn = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder service) {
             mScreenShareSvc = IScreenSharing.Stub.asInterface(service);
 
@@ -54,7 +54,7 @@ public void onServiceDisconnected(ComponentName className) {
         }
     };
 
-    private INotification mNotification = new INotification.Stub() {
+    private final INotification mNotification = new INotification.Stub() {
         /**
          * This is called by the remote service to tell us about error happened.
          * Note that IPC calls are dispatched through a thread

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static ScreenSharingClient getInstance() {`
`35`	`35`	`return mInstance;`
`36`	`36`	`}`
`37`	`37`
`38`		`- private ServiceConnection mScreenShareConn = new ServiceConnection() {`
	`38`	`+ private final ServiceConnection mScreenShareConn = new ServiceConnection() {`
`39`	`39`	`public void onServiceConnected(ComponentName className, IBinder service) {`
`40`	`40`	`mScreenShareSvc = IScreenSharing.Stub.asInterface(service);`
`41`	`41`
`@@ -54,7 +54,7 @@ public void onServiceDisconnected(ComponentName className) {`
`54`	`54`	`}`
`55`	`55`	`};`
`56`	`56`
`57`		`- private INotification mNotification = new INotification.Stub() {`
	`57`	`+ private final INotification mNotification = new INotification.Stub() {`
`58`	`58`	`/**`
`59`	`59`	`* This is called by the remote service to tell us about error happened.`
`60`	`60`	`* Note that IPC calls are dispatched through a thread`