summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-02-23 10:54:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-23 10:54:40 +0000
commitc90df0768a9be3e40d7c1edfdfb28af7bd25d98e (patch)
treec4dc5c94061afa175e9c8e583e3846920171239d
parent92c4f1756d4ae8ef1082f159f7133ad811f235d4 (diff)
parent6b492e78115833f0093d1517483728b574121c07 (diff)
downloadframeworks_base-c90df0768a9be3e40d7c1edfdfb28af7bd25d98e.zip
frameworks_base-c90df0768a9be3e40d7c1edfdfb28af7bd25d98e.tar.gz
frameworks_base-c90df0768a9be3e40d7c1edfdfb28af7bd25d98e.tar.bz2
am 6b492e78: Merge "Clean up Javadocs for UEventObserver"
* commit '6b492e78115833f0093d1517483728b574121c07': Clean up Javadocs for UEventObserver
-rw-r--r--core/java/android/os/UEventObserver.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/os/UEventObserver.java b/core/java/android/os/UEventObserver.java
index 9dbfd50..5c80ca6 100644
--- a/core/java/android/os/UEventObserver.java
+++ b/core/java/android/os/UEventObserver.java
@@ -22,13 +22,13 @@ import java.util.ArrayList;
import java.util.HashMap;
/**
- * UEventObserver is an abstract class that receives UEvent's from the kernel.<p>
+ * UEventObserver is an abstract class that receives UEvents from the kernel.<p>
*
* Subclass UEventObserver, implementing onUEvent(UEvent event), then call
* startObserving() with a match string. The UEvent thread will then call your
* onUEvent() method when a UEvent occurs that contains your match string.<p>
*
- * Call stopObserving() to stop receiving UEvent's.<p>
+ * Call stopObserving() to stop receiving UEvents.<p>
*
* There is only one UEvent thread per process, even if that process has
* multiple UEventObserver subclass instances. The UEvent thread starts when
@@ -78,7 +78,7 @@ public abstract class UEventObserver {
}
/**
- * Begin observation of UEvent's.<p>
+ * Begin observation of UEvents.<p>
* This method will cause the UEvent thread to start if this is the first
* invocation of startObserving in this process.<p>
* Once called, the UEvent thread will call onUEvent() when an incoming
@@ -103,7 +103,7 @@ public abstract class UEventObserver {
}
/**
- * End observation of UEvent's.<p>
+ * End observation of UEvents.<p>
* This process's UEvent thread will never call onUEvent() on this
* UEventObserver after this call. Repeated calls have no effect.
*/