diff options
| author | Jeff Brown <jeffbrown@google.com> | 2015-06-11 02:37:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 02:37:29 +0000 |
| commit | 3c9614a03a40c3590b38eed71f86c24d81c6d52a (patch) | |
| tree | 24fcc06af1479d8a4114268283c7c70805e76e0b | |
| parent | 5b65a36d59a5ca09dc12c22c8b2f8dc50e3b4fbb (diff) | |
| parent | 40f58d910a45f04f47d6382e8c78c78727944821 (diff) | |
| download | frameworks_base-3c9614a03a40c3590b38eed71f86c24d81c6d52a.zip frameworks_base-3c9614a03a40c3590b38eed71f86c24d81c6d52a.tar.gz frameworks_base-3c9614a03a40c3590b38eed71f86c24d81c6d52a.tar.bz2 | |
Merge "Expose Context.getSystemServiceName()." into mnc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index fb60f1c..3032b2d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7721,6 +7721,7 @@ package android.content { method public final java.lang.String getString(int, java.lang.Object...); method public abstract java.lang.Object getSystemService(java.lang.String); method public final T getSystemService(java.lang.Class<T>); + method public abstract java.lang.String getSystemServiceName(java.lang.Class<?>); method public final java.lang.CharSequence getText(int); method public abstract android.content.res.Resources.Theme getTheme(); method public abstract deprecated android.graphics.drawable.Drawable getWallpaper(); diff --git a/api/system-current.txt b/api/system-current.txt index 7816c3f..2727caa 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7944,6 +7944,7 @@ package android.content { method public final java.lang.String getString(int, java.lang.Object...); method public abstract java.lang.Object getSystemService(java.lang.String); method public final T getSystemService(java.lang.Class<T>); + method public abstract java.lang.String getSystemServiceName(java.lang.Class<?>); method public final java.lang.CharSequence getText(int); method public abstract android.content.res.Resources.Theme getTheme(); method public abstract deprecated android.graphics.drawable.Drawable getWallpaper(); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a434c7b..33f38fb 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); |