am 641bb3d8: expose (but still hide) sms user data headers
Merge commit '641bb3d8dfd72f57356d39ef00256d6077c9e235'
* commit '641bb3d8dfd72f57356d39ef00256d6077c9e235':
expose (but still hide) sms user data headers
diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java
index e73de3c..f9b95b2 100644
--- a/telephony/java/android/telephony/SmsMessage.java
+++ b/telephony/java/android/telephony/SmsMessage.java
@@ -517,9 +517,14 @@
return mWrappedSmsMessage.getUserData();
}
- /* Not part of the SDK interface and only needed by specific classes:
- protected SmsHeader getUserDataHeader()
- */
+ /**
+ * Return the user data header (UDH).
+ *
+ * @hide
+ */
+ public SmsHeader getUserDataHeader() {
+ return mWrappedSmsMessage.getUserDataHeader();
+ }
/**
* Returns the raw PDU for the message.
diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
index bfdd8a7..6435be5 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -637,8 +637,6 @@
/**
* Returns an object representing the user data headers
*
- * @return an object representing the user data headers
- *
* {@hide}
*/
SmsHeader getUserDataHeader() {