commit 3d3b4059d7b1fc5a03c4b049b1d436f28ecf84ec
author Santos Cordon <santoscordon@google.com> Mon May 05 12:05:36 2014 -0700
committer Santos Cordon <santoscordon@google.com> Tue May 06 10:33:47 2014 -0700
tree 80e7ee9f34a4b2522e53588ae3cc29c337ffb415
parent c499c1c0758dcb4b02048df96e7405994660ab3f

Combining Wrappers and adapters.

Cleaner code this way with fewer indirections. Also maps better to new
Telecomm design.

Change-Id: I88cf8f6382f307a7a2ce86e8acdd614283d1d0a5

src/com/android/telecomm/CallIdMapper.java

diff --git a/src/com/android/telecomm/CallIdMapper.java b/src/com/android/telecomm/CallIdMapper.java
index a5d70bf..7044d89 100644
--- a/src/com/android/telecomm/CallIdMapper.java
+++ b/src/com/android/telecomm/CallIdMapper.java
@@ -65,7 +65,7 @@
         if (objId instanceof String) {
             callId = (String) objId;
         }
-        Preconditions.checkArgument(isValidCallId(callId));
+        checkValidCallId(callId);
 
         return mCalls.get(callId);
     }
@@ -73,8 +73,8 @@
     void checkValidCallId(String callId) {
         // Note, no need for thread check, this method is thread safe.
         if (!isValidCallId(callId)) {
-            Log.wtf(this, "%s is not a valid call ID", callId);
-            throw new IllegalArgumentException("Invalid call ID.");
+            throw new IllegalArgumentException(
+                    "Invalid call ID for " + mCallIdPrefix + ": " + callId);
         }
     }