diff --git a/Android.mk b/Android.mk
index 6ee75f0..66989db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
-LOCAL_JAVA_LIBRARIES := 
+LOCAL_JAVA_LIBRARIES := telephony-common
 
 LOCAL_PACKAGE_NAME := DrmProvider
 LOCAL_CERTIFICATE := media
diff --git a/src/com/android/providers/drm/DrmPushReceiver.java b/src/com/android/providers/drm/DrmPushReceiver.java
index abe5ca0..4922330 100644
--- a/src/com/android/providers/drm/DrmPushReceiver.java
+++ b/src/com/android/providers/drm/DrmPushReceiver.java
@@ -22,11 +22,11 @@
 import android.drm.mobile1.DrmException;
 import android.drm.mobile1.DrmRights;
 import android.drm.mobile1.DrmRightsManager;
-import static android.provider.Telephony.Sms.Intents.WAP_PUSH_RECEIVED_ACTION;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.BroadcastReceiver;
+import android.provider.Telephony;
 import android.util.Log;
 
 public class DrmPushReceiver extends BroadcastReceiver {
@@ -34,7 +34,7 @@
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (intent.getAction().equals(WAP_PUSH_RECEIVED_ACTION)) {
+        if (intent.getAction().equals(Telephony.Sms.Intents.WAP_PUSH_RECEIVED_ACTION)) {
             // Get right mimetype.
             String rightMimeType = intent.getType();
             if (DrmRightsManager.DRM_MIMETYPE_RIGHTS_XML_STRING.equals(rightMimeType) ||
