From 86c9fb41736f5848acf7baf71ebfe39df204ad4b Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Wed, 24 Feb 2016 13:17:21 -0800
Subject: [PATCH] Adding missing break statements causing crash on
 MSG_SET_EXTRAS.

The case block for MSG_SET_EXTRAS was missing its break statement, all
the way back to summer 2015 when that code was originally added.

When the new MSG_ON_CONNECTION_EVENT handler was added, it introduced a
new potential fall-through from MSG_SET_EXTRAS (in addition to the fact it
too was missing a break statement).

Bug: 27338441
Change-Id: I2df2bc78c4ceb32e6245888eed18c2d8834e629b
---
 .../java/android/telecom/ConnectionServiceAdapterServant.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
index a7909143e5f56..6a8c1cb281ba8 100644
--- a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
@@ -240,8 +240,8 @@ final class ConnectionServiceAdapterServant {
                     } finally {
                         args.recycle();
                     }
+                    break;
                 }
-
                 case MSG_ON_CONNECTION_EVENT: {
                     SomeArgs args = (SomeArgs) msg.obj;
                     try {
@@ -249,6 +249,7 @@ final class ConnectionServiceAdapterServant {
                     } finally {
                         args.recycle();
                     }
+                    break;
                 }
             }
         }