summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-07-11 18:07:58 -0700
committerWink Saville <wink@google.com>2012-07-11 18:07:58 -0700
commitf7b77c235ea5d4c9cba611d3ea23c63143c150c6 (patch)
tree2a812ca8158eb0bf236fca75d16849e6b3f1a57c
parent92f5048dd69718ebb4d83cd71e19717aa0b74368 (diff)
parentf691758c787aa63e72460cfc07bd983eea03dee0 (diff)
downloadandroid_packages_apps_BasicSmsReceiver-f7b77c235ea5d4c9cba611d3ea23c63143c150c6.tar.gz
android_packages_apps_BasicSmsReceiver-f7b77c235ea5d4c9cba611d3ea23c63143c150c6.tar.bz2
android_packages_apps_BasicSmsReceiver-f7b77c235ea5d4c9cba611d3ea23c63143c150c6.zip
Merge commit 'f691758c' into mit
* commit 'f691758c': Use telephony-common
-rwxr-xr-xAndroid.mk1
-rw-r--r--tests/Android.mk2
-rw-r--r--tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java1
3 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index c0cb798..50d2f1c 100755
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
+LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := BasicSmsReceiver
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 @@ include $(CLEAR_VARS)
# 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)
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.database.Cursor;
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;