summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-02-23 11:06:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-23 11:06:44 +0000
commit3ef69833fe5733839ada1aa2300f875fc69e6a3c (patch)
tree2c7f39ddac6152645124a883835957150065f4ef /core/java/android/os
parent48c217ab9133fbcd793e74867dd864f43f2bcfaf (diff)
parent836e4413d03d8699fa8817999fe9a1ff65541c29 (diff)
downloadframeworks_base-3ef69833fe5733839ada1aa2300f875fc69e6a3c.zip
frameworks_base-3ef69833fe5733839ada1aa2300f875fc69e6a3c.tar.gz
frameworks_base-3ef69833fe5733839ada1aa2300f875fc69e6a3c.tar.bz2
am 836e4413: am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver"
* commit '836e4413d03d8699fa8817999fe9a1ff65541c29': Clean up Javadocs for UEventObserver
Diffstat (limited to 'core/java/android/os')
-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.
*/