Merge "Remove the Android FieldPositionIterator::getData extension."
diff --git a/i18n/fpositer.cpp b/i18n/fpositer.cpp
index a3c24b7..e2d3027 100644
--- a/i18n/fpositer.cpp
+++ b/i18n/fpositer.cpp
@@ -56,20 +56,6 @@
return rhs.data ? data->operator==(*rhs.data) : FALSE;
}
-// BEGIN android-added
-int32_t FieldPositionIterator::getData(int32_t *dest, int32_t capacity) const {
- int32_t len = data ? data->size() : 0;
- if (len && dest) {
- if (capacity < len) {
- len = -len; // error, insufficient capacity
- } else {
- memcpy(dest, data->getBuffer(), len * sizeof(int32_t));
- }
- }
- return len;
-}
-// END android-added
-
void FieldPositionIterator::setData(UVector32 *adopt, UErrorCode& status) {
// Verify that adopt has valid data, and update status if it doesn't.
if (U_SUCCESS(status)) {
diff --git a/i18n/unicode/fpositer.h b/i18n/unicode/fpositer.h
index 704386d..b842161 100644
--- a/i18n/unicode/fpositer.h
+++ b/i18n/unicode/fpositer.h
@@ -96,17 +96,6 @@
*/
UBool next(FieldPosition& fp);
- // BEGIN android-added
- /**
- * Returns the data. If dest is null, returns the length of the data.
- * Otherwise, if capacity is insufficient, returns the negative of the
- * length of the data. Otherwise, copies data into dest and returns
- * the length of the data.
- * @internal
- */
- int32_t getData(int32_t *dest, int32_t capacity) const;
- // END android-added
-
private:
friend class FieldPositionIteratorHandler;
