diff options
| -rw-r--r-- | api/3.xml | 82 | ||||
| -rw-r--r-- | api/current.xml | 80 | ||||
| -rw-r--r-- | core/java/android/net/NetworkInfo.java | 10 | ||||
| -rw-r--r-- | tests/CoreTests/android/core/LocaleTest.java | 52 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 8 |
5 files changed, 194 insertions, 38 deletions
@@ -57915,7 +57915,7 @@ type="float" transient="false" volatile="false" - value="0.0010f" + value="0.001f" static="true" final="true" deprecated="not deprecated" @@ -69483,16 +69483,6 @@ > <implements name="android.os.Parcelable"> </implements> -<constructor name="NetworkInfo" - type="android.net.NetworkInfo" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="type" type="int"> -</parameter> -</constructor> <method name="describeContents" return="int" abstract="false" @@ -69548,6 +69538,28 @@ visibility="public" > </method> +<method name="getSubtype" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSubtypeName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getType" return="int" abstract="false" @@ -69614,6 +69626,17 @@ visibility="public" > </method> +<method name="isRoaming" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="writeToParcel" return="void" abstract="false" @@ -72469,6 +72492,21 @@ deprecated="not deprecated" visibility="public" > +<parameter name="lockType" type="int"> +</parameter> +<parameter name="tag" type="java.lang.String"> +</parameter> +</method> +<method name="createWifiLock" + return="android.net.wifi.WifiManager.WifiLock" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="tag" type="java.lang.String"> </parameter> </method> @@ -72847,6 +72885,28 @@ visibility="public" > </field> +<field name="WIFI_MODE_FULL" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_MODE_SCAN_ONLY" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="WIFI_STATE_CHANGED_ACTION" type="java.lang.String" transient="false" diff --git a/api/current.xml b/api/current.xml index e6825f4..204cc9b 100644 --- a/api/current.xml +++ b/api/current.xml @@ -72743,16 +72743,6 @@ > <implements name="android.os.Parcelable"> </implements> -<constructor name="NetworkInfo" - type="android.net.NetworkInfo" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="type" type="int"> -</parameter> -</constructor> <method name="describeContents" return="int" abstract="false" @@ -72808,6 +72798,28 @@ visibility="public" > </method> +<method name="getSubtype" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSubtypeName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getType" return="int" abstract="false" @@ -72874,6 +72886,17 @@ visibility="public" > </method> +<method name="isRoaming" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="writeToParcel" return="void" abstract="false" @@ -75729,6 +75752,21 @@ deprecated="not deprecated" visibility="public" > +<parameter name="lockType" type="int"> +</parameter> +<parameter name="tag" type="java.lang.String"> +</parameter> +</method> +<method name="createWifiLock" + return="android.net.wifi.WifiManager.WifiLock" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> <parameter name="tag" type="java.lang.String"> </parameter> </method> @@ -76107,6 +76145,28 @@ visibility="public" > </field> +<field name="WIFI_MODE_FULL" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="WIFI_MODE_SCAN_ONLY" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="WIFI_STATE_CHANGED_ACTION" type="java.lang.String" transient="false" diff --git a/core/java/android/net/NetworkInfo.java b/core/java/android/net/NetworkInfo.java index 8c82212..9f53937 100644 --- a/core/java/android/net/NetworkInfo.java +++ b/core/java/android/net/NetworkInfo.java @@ -114,8 +114,10 @@ public class NetworkInfo implements Parcelable { private boolean mIsAvailable; /** - * TODO This is going away as soon as API council review happens. * @param type network type + * @deprecated + * @hide because this constructor was only meant for internal use (and + * has now been superseded by the package-private constructor below). */ public NetworkInfo(int type) {} @@ -146,8 +148,6 @@ public class NetworkInfo implements Parcelable { * Return a network-type-specific integer describing the subtype * of the network. * @return the network subtype - * - * @hide pending API council review */ public int getSubtype() { return mSubtype; @@ -170,8 +170,6 @@ public class NetworkInfo implements Parcelable { /** * Return a human-readable name describing the subtype of the network. * @return the name of the network subtype - * - * @hide pending API council review */ public String getSubtypeName() { return mSubtypeName; @@ -251,8 +249,6 @@ public class NetworkInfo implements Parcelable { * When {@code true}, it suggests that use of data on this network * may incur extra costs. * @return {@code true} if roaming is in effect, {@code false} otherwise. - * - * @hide pending API council */ public boolean isRoaming() { return mIsRoaming; diff --git a/tests/CoreTests/android/core/LocaleTest.java b/tests/CoreTests/android/core/LocaleTest.java index 700cf1d..72489c6 100644 --- a/tests/CoreTests/android/core/LocaleTest.java +++ b/tests/CoreTests/android/core/LocaleTest.java @@ -28,6 +28,7 @@ import java.util.TimeZone; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.LargeTest; +import android.test.suitebuilder.annotation.Suppress; /** * Test some locale-dependent stuff for Android. This test mainly ensures that @@ -52,6 +53,48 @@ public class LocaleTest extends TestCase { assertEquals("en_US_POSIX", locale.toString()); } + /* + * Tests some must-have locales. TODO: Add back "de". See discussion + * immediately below this method. + */ + @LargeTest + public void testResourceBundles() throws Exception { + Locale eng = new Locale("en", "US"); + DateFormatSymbols engSymbols = new DateFormatSymbols(eng); + + //Locale deu = new Locale("de", "DE"); + //DateFormatSymbols deuSymbols = new DateFormatSymbols(deu); + + TimeZone berlin = TimeZone.getTimeZone("Europe/Berlin"); + + assertEquals("January", engSymbols.getMonths()[0]); + //assertEquals("Januar", deuSymbols.getMonths()[0]); + + assertEquals("Sunday", engSymbols.getWeekdays()[Calendar.SUNDAY]); + //assertEquals("Sonntag", deuSymbols.getWeekdays()[Calendar.SUNDAY]); + + assertEquals("Central European Time", + berlin.getDisplayName(false, TimeZone.LONG, eng)); + assertEquals("Central European Summer Time", + berlin.getDisplayName(true, TimeZone.LONG, eng)); + + //assertEquals("Mitteleurop\u00E4ische Zeit", + // berlin.getDisplayName(false, TimeZone.LONG, deu)); + //assertEquals("Mitteleurop\u00E4ische Sommerzeit", + // berlin.getDisplayName(true, TimeZone.LONG, deu)); + + assertTrue(engSymbols.getZoneStrings().length > 100); + } + + /* + * Disabled version of the above test. The version above omits + * checks for stuff in the "de" locale, because we stripped that + * out as part of the flash reduction effort (so that we could + * still ship on Dream). We expect to have a baseline target that + * includes a large enough system partition to include "de" + * immediately after the last official release for Dream (whenever + * that may be). + * // Test some must-have locales. @LargeTest public void testResourceBundles() throws Exception { @@ -81,10 +124,11 @@ public class LocaleTest extends TestCase { assertTrue(engSymbols.getZoneStrings().length > 100); } - - // Regression test for 1118570: Create test cases for tracking ICU config - // changes. This one makes sure we have all necessary locales installed. - @MediumTest + */ + + // This one makes sure we have all necessary locales installed. + // Suppress this flaky test for now. + @Suppress public void testICULocales() { String[] locales = new String[] { // List of locales currently required for Android. diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 483e0fa..a51e88f 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -226,23 +226,21 @@ public class WifiManager { public static final String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK"; /** - * In this mode, Wi-Fi will be kept active, + * In this Wi-Fi lock mode, Wi-Fi will be kept active, * and will behave normally, i.e., it will attempt to automatically * establish a connection to a remembered access point that is * within range, and will do periodic scans if there are remembered * access points but none are in range. - * @hide pending API council review */ public static final int WIFI_MODE_FULL = 1; /** - * In this mode, Wi-Fi will be kept active, + * In this Wi-Fi lock mode, Wi-Fi will be kept active, * but the only operation that will be supported is initiation of * scans, and the subsequent reporting of scan results. No attempts * will be made to automatically connect to remembered access points, * nor will periodic scans be automatically performed looking for * remembered access points. Scans must be explicitly requested by * an application in this mode. - * @hide pending API council review */ public static final int WIFI_MODE_SCAN_ONLY = 2; @@ -805,8 +803,6 @@ public class WifiManager { * @return a new, unacquired WifiLock with the given tag. * * @see WifiLock - * - * @hide pending API council review */ public WifiLock createWifiLock(int lockType, String tag) { return new WifiLock(lockType, tag); |