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

Commit 3a02a369 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Temporarily remove @Nullable from getSystemService(...) methods" into... 

Merge "Temporarily remove @Nullable from getSystemService(...) methods" into main am: 515e708b am: 60340d2e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3139200



Change-Id: Id8f151c1763d6803539eb293a7a27ed26939488c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 995c3b2e 60340d2e

core/java/android/content/Context.java

+4 −2
Original line number Diff line number Diff line
@@ -4451,7 +4451,8 @@ public abstract class Context { 
     * @see #DISPLAY_HASH_SERVICE

     * @see android.view.displayhash.DisplayHashManager

     */

    public abstract @Nullable Object getSystemService(@ServiceName @NonNull String name);

    // TODO(b/347269120): Re-add @Nullable

    public abstract Object getSystemService(@ServiceName @NonNull String name);



    /**

     * Return the handle to a system-level service by class.
@@ -4495,7 +4496,8 @@ public abstract class Context { 
     * <b>never</b> throw a {@link RuntimeException} if the name is not supported.

     */

    @SuppressWarnings("unchecked")

    public final @Nullable <T> T getSystemService(@NonNull Class<T> serviceClass) {

    // TODO(b/347269120): Re-add @Nullable

    public final <T> T getSystemService(@NonNull Class<T> serviceClass) {

        // Because subclasses may override getSystemService(String) we cannot

        // perform a lookup by class alone.  We must first map the class to its

        // service name then invoke the string-based method.

core/java/android/content/ContextWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -932,7 +932,8 @@ public class ContextWrapper extends Context { 
    }



    @Override

    public @Nullable Object getSystemService(String name) {

    // TODO(b/347269120): Re-add @Nullable

    public Object getSystemService(String name) {

        return mBase.getSystemService(name);

    }