commit f7b77c235ea5d4c9cba611d3ea23c63143c150c6
author Wink Saville <wink@google.com> Wed Jul 11 18:07:58 2012 -0700
committer Wink Saville <wink@google.com> Wed Jul 11 18:07:58 2012 -0700
tree 2a812ca8158eb0bf236fca75d16849e6b3f1a57c
parent 92f5048dd69718ebb4d83cd71e19717aa0b74368
parent f691758c787aa63e72460cfc07bd983eea03dee0

Merge commit 'f691758c' into mit

* commit 'f691758c':
  Use telephony-common

Android.mk

diff --git a/Android.mk b/Android.mk
index c0cb798..50d2f1c 100755
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_JAVA_LIBRARIES := telephony-common
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := BasicSmsReceiver

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index fe54a33..892a3b8 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,7 +18,7 @@
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)

tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java

diff --git a/tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java b/tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java
index 265e9e8..5994861 100644
--- a/tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java
+++ b/tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java
@@ -29,7 +29,6 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.provider.Telephony;
-import android.provider.Telephony.Sms.Intents;
 import android.telephony.SmsManager;
 import android.telephony.SmsMessage;
 import android.telephony.TelephonyManager;