summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2015-06-11 03:01:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-11 03:01:19 +0000
commit04eeeaafb9d9a7cbd9cc2cc73dd64a814fb9a57c (patch)
tree3ef9141a62a1d0e4709660eb4e953cf98728868a /core/java/android
parente0c4fb5cfc872bf0912985b49a579bfa7b25adff (diff)
parent468353e3229a4f3895e4ad6c09959b1d0f942e49 (diff)
am 468353e3: am 3c9614a0: Merge "Expose Context.getSystemServiceName()." into mnc-dev
* commit '468353e3229a4f3895e4ad6c09959b1d0f942e49': Expose Context.getSystemServiceName().
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Context.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index a434c7be1e90..33f38fb664bc 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2443,8 +2443,6 @@ public abstract class Context {
*
* @param serviceClass The class of the desired service.
* @return The service name or null if the class is not a supported system service.
- *
- * @hide
*/
public abstract String getSystemServiceName(Class<?> serviceClass);