summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dalvik/src/main/java/dalvik/system/DexPathList.java18
-rw-r--r--dalvik/src/main/java/dalvik/system/VMDebug.java4
-rw-r--r--libart/src/main/java/dalvik/system/VMRuntime.java10
-rw-r--r--libdvm/src/main/java/dalvik/system/VMRuntime.java10
-rw-r--r--luni/src/main/java/java/net/HttpURLConnection.java6
-rw-r--r--luni/src/main/java/java/text/SimpleDateFormat.java4
-rw-r--r--luni/src/main/java/java/util/Locale.java35
7 files changed, 52 insertions, 35 deletions
diff --git a/dalvik/src/main/java/dalvik/system/DexPathList.java b/dalvik/src/main/java/dalvik/system/DexPathList.java
index caaf9c4..ff0be41 100644
--- a/dalvik/src/main/java/dalvik/system/DexPathList.java
+++ b/dalvik/src/main/java/dalvik/system/DexPathList.java
@@ -150,17 +150,13 @@ import static libcore.io.OsConstants.*;
* do not refer to existing and readable directories.
*/
private static File[] splitLibraryPath(String path) {
- /*
- * Native libraries may exist in both the system and
- * application library paths, and we use this search order:
- *
- * 1. this class loader's library path for application
- * libraries
- * 2. the VM's library path from the system
- * property for system libraries
- *
- * This order was reversed prior to Gingerbread; see http://b/2933456.
- */
+ // Native libraries may exist in both the system and
+ // application library paths, and we use this search order:
+ //
+ // 1. this class loader's library path for application libraries
+ // 2. the VM's library path from the system property for system libraries
+ //
+ // This order was reversed prior to Gingerbread; see http://b/2933456.
ArrayList<File> result = splitPaths(path, System.getProperty("java.library.path"), true);
return result.toArray(new File[result.size()]);
}
diff --git a/dalvik/src/main/java/dalvik/system/VMDebug.java b/dalvik/src/main/java/dalvik/system/VMDebug.java
index d2f96c3..a46119f 100644
--- a/dalvik/src/main/java/dalvik/system/VMDebug.java
+++ b/dalvik/src/main/java/dalvik/system/VMDebug.java
@@ -243,7 +243,7 @@ public final class VMDebug {
/**
* This method exists for binary compatibility. It was part of
- * the allocation limits API which was removed in Honeycomb.
+ * the allocation limits API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public static int setAllocationLimit(int limit) {
@@ -252,7 +252,7 @@ public final class VMDebug {
/**
* This method exists for binary compatibility. It was part of
- * the allocation limits API which was removed in Honeycomb.
+ * the allocation limits API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public static int setGlobalAllocationLimit(int limit) {
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index d322c16..19e18da 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -122,7 +122,7 @@ public final class VMRuntime {
/**
* This method exists for binary compatibility. It was part of a
- * heap sizing API which was removed in Honeycomb.
+ * heap sizing API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public long getMinimumHeapSize() {
@@ -131,7 +131,7 @@ public final class VMRuntime {
/**
* This method exists for binary compatibility. It was part of a
- * heap sizing API which was removed in Honeycomb.
+ * heap sizing API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public long setMinimumHeapSize(long size) {
@@ -164,7 +164,7 @@ public final class VMRuntime {
/**
* This method exists for binary compatibility. It was part of
- * the external allocation API which was removed in Honeycomb.
+ * the external allocation API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public boolean trackExternalAllocation(long size) {
@@ -173,14 +173,14 @@ public final class VMRuntime {
/**
* This method exists for binary compatibility. It was part of
- * the external allocation API which was removed in Honeycomb.
+ * the external allocation API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public void trackExternalFree(long size) {}
/**
* This method exists for binary compatibility. It was part of
- * the external allocation API which was removed in Honeycomb.
+ * the external allocation API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public long getExternalBytesAllocated() {
diff --git a/libdvm/src/main/java/dalvik/system/VMRuntime.java b/libdvm/src/main/java/dalvik/system/VMRuntime.java
index 8ee607c..cd4a9db 100644
--- a/libdvm/src/main/java/dalvik/system/VMRuntime.java
+++ b/libdvm/src/main/java/dalvik/system/VMRuntime.java
@@ -122,7 +122,7 @@ public final class VMRuntime {
/**
* This method exists for binary compatibility. It was part of a
- * heap sizing API which was removed in Honeycomb.
+ * heap sizing API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public long getMinimumHeapSize() {
@@ -131,7 +131,7 @@ public final class VMRuntime {
/**
* This method exists for binary compatibility. It was part of a
- * heap sizing API which was removed in Honeycomb.
+ * heap sizing API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public long setMinimumHeapSize(long size) {
@@ -164,7 +164,7 @@ public final class VMRuntime {
/**
* This method exists for binary compatibility. It was part of
- * the external allocation API which was removed in Honeycomb.
+ * the external allocation API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public boolean trackExternalAllocation(long size) {
@@ -173,14 +173,14 @@ public final class VMRuntime {
/**
* This method exists for binary compatibility. It was part of
- * the external allocation API which was removed in Honeycomb.
+ * the external allocation API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public void trackExternalFree(long size) {}
/**
* This method exists for binary compatibility. It was part of
- * the external allocation API which was removed in Honeycomb.
+ * the external allocation API which was removed in Android 3.0 (Honeycomb).
*/
@Deprecated
public long getExternalBytesAllocated() {
diff --git a/luni/src/main/java/java/net/HttpURLConnection.java b/luni/src/main/java/java/net/HttpURLConnection.java
index d6b2435..89a4bc4 100644
--- a/luni/src/main/java/java/net/HttpURLConnection.java
+++ b/luni/src/main/java/java/net/HttpURLConnection.java
@@ -235,9 +235,9 @@ import java.util.Arrays;
* until a connection is established.
*
* <h3>Response Caching</h3>
- * Android 4.0 (Ice Cream Sandwich) includes a response cache. See {@code
- * android.net.http.HttpResponseCache} for instructions on enabling HTTP caching
- * in your application.
+ * Android 4.0 (Ice Cream Sandwich, API level 15) includes a response cache. See
+ * {@code android.net.http.HttpResponseCache} for instructions on enabling HTTP
+ * caching in your application.
*
* <h3>Avoiding Bugs In Earlier Releases</h3>
* Prior to Android 2.2 (Froyo), this class had some frustrating bugs. In
diff --git a/luni/src/main/java/java/text/SimpleDateFormat.java b/luni/src/main/java/java/text/SimpleDateFormat.java
index ea90bbb..5fd8a56 100644
--- a/luni/src/main/java/java/text/SimpleDateFormat.java
+++ b/luni/src/main/java/java/text/SimpleDateFormat.java
@@ -94,7 +94,7 @@ import libcore.icu.TimeZoneNames;
* <p>Fractional seconds are handled specially: they're zero-padded on the <i>right</i>.
*
* <p>The two pattern characters {@code L} and {@code c} are ICU-compatible extensions, not
- * available in the RI or in Android before Android 2.3 "Gingerbread" (API level 9). These
+ * available in the RI or in Android before Android 2.3 (Gingerbread, API level 9). These
* extensions are necessary for correct localization in languages such as Russian
* that make a grammatical distinction between, say, the word "June" in the sentence "June" and
* in the sentence "June 10th"; the former is the stand-alone form, the latter the regular
@@ -102,7 +102,7 @@ import libcore.icu.TimeZoneNames;
* and {@code c} is equivalent, but for weekday names.
*
* <p>Five-count patterns (such as "MMMMM") used for the shortest non-numeric
- * representation of a field were introduced in Jelly Bean MR2 (API level 18).
+ * representation of a field were introduced in Android 4.3 (Jelly Bean MR2, API level 18).
*
* <p>When two numeric fields are directly adjacent with no intervening delimiter
* characters, they constitute a run of adjacent numeric fields. Such runs are
diff --git a/luni/src/main/java/java/util/Locale.java b/luni/src/main/java/java/util/Locale.java
index fcb821d..379d479 100644
--- a/luni/src/main/java/java/util/Locale.java
+++ b/luni/src/main/java/java/util/Locale.java
@@ -66,13 +66,34 @@ import libcore.icu.ICU;
* <p>Here are the versions of ICU (and the corresponding CLDR and Unicode versions) used in
* various Android releases:
* <table BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
- * <tr><td>Cupcake/Donut/Eclair</td> <td>ICU 3.8</td> <td><a href="http://cldr.unicode.org/index/downloads/cldr-1-5">CLDR 1.5</a></td> <td><a href="http://www.unicode.org/versions/Unicode5.0.0/">Unicode 5.0</a></td></tr>
- * <tr><td>Froyo</td> <td>ICU 4.2</td> <td><a href="http://cldr.unicode.org/index/downloads/cldr-1-7">CLDR 1.7</a></td> <td><a href="http://www.unicode.org/versions/Unicode5.1.0/">Unicode 5.1</a></td></tr>
- * <tr><td>Gingerbread/Honeycomb</td><td>ICU 4.4</td> <td><a href="http://cldr.unicode.org/index/downloads/cldr-1-8">CLDR 1.8</a></td> <td><a href="http://www.unicode.org/versions/Unicode5.2.0/">Unicode 5.2</a></td></tr>
- * <tr><td>Ice Cream Sandwich</td> <td>ICU 4.6</td> <td><a href="http://cldr.unicode.org/index/downloads/cldr-1-9">CLDR 1.9</a></td> <td><a href="http://www.unicode.org/versions/Unicode6.0.0/">Unicode 6.0</a></td></tr>
- * <tr><td>Jelly Bean</td> <td>ICU 4.8</td> <td><a href="http://cldr.unicode.org/index/downloads/cldr-2-0">CLDR 2.0</a></td> <td><a href="http://www.unicode.org/versions/Unicode6.0.0/">Unicode 6.0</a></td></tr>
- * <tr><td>Jelly Bean MR2</td> <td>ICU 50</td> <td><a href="http://cldr.unicode.org/index/downloads/cldr-22-1">CLDR 22.1</a></td> <td><a href="http://www.unicode.org/versions/Unicode6.2.0/">Unicode 6.2</a></td></tr>
- * <tr><td>Key Lime Pie</td> <td>ICU 51</td> <td><a href="http://cldr.unicode.org/index/downloads/cldr-23">CLDR 23</a></td> <td><a href="http://www.unicode.org/versions/Unicode6.2.0/">Unicode 6.2</a></td></tr>
+ * <tr><td>Android 1.5 (Cupcake)/Android 1.6 (Donut)/Android 2.0 (Eclair)</td>
+ * <td>ICU 3.8</td>
+ * <td><a href="http://cldr.unicode.org/index/downloads/cldr-1-5">CLDR 1.5</a></td>
+ * <td><a href="http://www.unicode.org/versions/Unicode5.0.0/">Unicode 5.0</a></td></tr>
+ * <tr><td>Android 2.2 (Froyo)</td>
+ * <td>ICU 4.2</td>
+ * <td><a href="http://cldr.unicode.org/index/downloads/cldr-1-7">CLDR 1.7</a></td>
+ * <td><a href="http://www.unicode.org/versions/Unicode5.1.0/">Unicode 5.1</a></td></tr>
+ * <tr><td>Android 2.3 (Gingerbread)/Android 3.0 (Honeycomb)</td>
+ * <td>ICU 4.4</td>
+ * <td><a href="http://cldr.unicode.org/index/downloads/cldr-1-8">CLDR 1.8</a></td>
+ * <td><a href="http://www.unicode.org/versions/Unicode5.2.0/">Unicode 5.2</a></td></tr>
+ * <tr><td>Android 4.0 (Ice Cream Sandwich)</td>
+ * <td>ICU 4.6</td>
+ * <td><a href="http://cldr.unicode.org/index/downloads/cldr-1-9">CLDR 1.9</a></td>
+ * <td><a href="http://www.unicode.org/versions/Unicode6.0.0/">Unicode 6.0</a></td></tr>
+ * <tr><td>Android 4.1 (Jelly Bean)</td>
+ * <td>ICU 4.8</td>
+ * <td><a href="http://cldr.unicode.org/index/downloads/cldr-2-0">CLDR 2.0</a></td>
+ * <td><a href="http://www.unicode.org/versions/Unicode6.0.0/">Unicode 6.0</a></td></tr>
+ * <tr><td>Android 4.3 (Jelly Bean MR2)</td>
+ * <td>ICU 50</td>
+ * <td><a href="http://cldr.unicode.org/index/downloads/cldr-22-1">CLDR 22.1</a></td>
+ * <td><a href="http://www.unicode.org/versions/Unicode6.2.0/">Unicode 6.2</a></td></tr>
+ * <tr><td>Android 4.4 (Kit Kat)</td>
+ * <td>ICU 51</td>
+ * <td><a href="http://cldr.unicode.org/index/downloads/cldr-23">CLDR 23</a></td>
+ * <td><a href="http://www.unicode.org/versions/Unicode6.2.0/">Unicode 6.2</a></td></tr>
* </table>
*
* <a name="default_locale"><h3>Be wary of the default locale</h3></a>
generated by cgit v1.1 at 2025-01-09 07:29:56 +0000