From 970567cab2fd74646eb5fedd1f49b1e8f1e30fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= <sakal@webrtc.org>
Date: Mon, 16 May 2016 16:24:14 +0200
Subject: [PATCH] Fixes a bug where AppRTC Android Demo crashes with empty
 roomId.

BUG=
R=magjed@webrtc.org

Review URL: https://codereview.webrtc.org/1975743002 .

Cr-Commit-Position: refs/heads/master@{#12759}
---
 .../androidapp/src/org/appspot/apprtc/CallActivity.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
index 21092227cc..ae653da63b 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
@@ -308,7 +308,9 @@ public class CallActivity extends Activity
     }
     activityRunning = false;
     rootEglBase.release();
-    cpuMonitor.release();
+    if (cpuMonitor != null) {
+      cpuMonitor.release();
+    }
     super.onDestroy();
   }