Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c9614a0 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Expose Context.getSystemServiceName()." into mnc-dev

parents 5b65a36d 40f58d91

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

core/java/android/content/Context.java

+0 −2
Original line number Diff line number Diff line
@@ -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);