summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/view/animation/Animation.java2
-rw-r--r--core/java/android/webkit/UrlInterceptHandler.java2
-rw-r--r--core/java/android/webkit/UrlInterceptRegistry.java2
-rw-r--r--core/java/android/webkit/gears/UrlInterceptHandlerGears.java2
-rw-r--r--services/java/com/android/server/LocationManagerService.java2
-rw-r--r--telephony/java/android/telephony/PhoneStateListener.java2
6 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java
index a6627609e3be..2f5e601f31eb 100644
--- a/core/java/android/view/animation/Animation.java
+++ b/core/java/android/view/animation/Animation.java
@@ -319,7 +319,7 @@ public abstract class Animation implements Cloneable {
*
* @param durationMillis Duration in milliseconds
*
- * @throw java.lang.IllegalArgumentException if the duration is < 0
+ * @throws java.lang.IllegalArgumentException if the duration is < 0
*
* @attr ref android.R.styleable#Animation_duration
*/
diff --git a/core/java/android/webkit/UrlInterceptHandler.java b/core/java/android/webkit/UrlInterceptHandler.java
index 9216413c4a75..766ed7e71206 100644
--- a/core/java/android/webkit/UrlInterceptHandler.java
+++ b/core/java/android/webkit/UrlInterceptHandler.java
@@ -30,7 +30,7 @@ public interface UrlInterceptHandler {
* @param url URL string.
* @param headers The headers associated with the request. May be null.
* @return The CacheResult containing the surrogate response.
- * @Deprecated Use PluginData getPluginData(String url,
+ * @deprecated Use PluginData getPluginData(String url,
* Map<String, String> headers); instead
*/
@Deprecated
diff --git a/core/java/android/webkit/UrlInterceptRegistry.java b/core/java/android/webkit/UrlInterceptRegistry.java
index 6051f290dffe..31005bb2341e 100644
--- a/core/java/android/webkit/UrlInterceptRegistry.java
+++ b/core/java/android/webkit/UrlInterceptRegistry.java
@@ -89,7 +89,7 @@ public final class UrlInterceptRegistry {
* UrlInterceptHandler interested, or null if none are.
*
* @return A CacheResult containing surrogate content.
- * @Deprecated Use PluginData getPluginData( String url,
+ * @deprecated Use PluginData getPluginData( String url,
* Map<String, String> headers) instead.
*/
@Deprecated
diff --git a/core/java/android/webkit/gears/UrlInterceptHandlerGears.java b/core/java/android/webkit/gears/UrlInterceptHandlerGears.java
index 43104bf293e3..887afc2d8c1c 100644
--- a/core/java/android/webkit/gears/UrlInterceptHandlerGears.java
+++ b/core/java/android/webkit/gears/UrlInterceptHandlerGears.java
@@ -331,7 +331,7 @@ public class UrlInterceptHandlerGears implements UrlInterceptHandler {
* @param url URL string.
* @param headers The headers associated with the request. May be null.
* @return The CacheResult containing the surrogate response.
- * @Deprecated Use PluginData getPluginData(String url,
+ * @deprecated Use PluginData getPluginData(String url,
* Map<String, String> headers); instead
*/
@Deprecated
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 4a4d5abb3371..99e6125a0d7f 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1402,7 +1402,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
/**
* @return null if the provider does not exits
- * @throw SecurityException if the provider is not allowed to be
+ * @throws SecurityException if the provider is not allowed to be
* accessed by the caller
*/
public Bundle getProviderInfo(String provider) {
diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java
index e113680b4e69..7d83ea865597 100644
--- a/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@ -154,7 +154,7 @@ public class PhoneStateListener {
* @see ServiceState#STATE_IN_SERVICE
* @see ServiceState#STATE_OUT_OF_SERVICE
* @see ServiceState#STATE_POWER_OFF
- * @deprecated, @see #onSignalStrengthsChanged
+ * @deprecated , @see #onSignalStrengthsChanged
*/
public void onSignalStrengthChanged(int asu) {
// default implementation empty