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

Commit 42ff650a authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Remove TODO(b/347269120)s as they will no longer be done" into aosp-main-future

parents 2cf32606 a8ad2ced

core/java/android/content/Context.java

+0 −2
Original line number Diff line number Diff line
@@ -4499,7 +4499,6 @@ public abstract class Context { 
     * @see #DISPLAY_HASH_SERVICE

     * @see android.view.displayhash.DisplayHashManager

     */

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

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



    /**
@@ -4545,7 +4544,6 @@ public abstract class Context { 
     */

    @SuppressWarnings("unchecked")

    @RavenwoodKeep

    // 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

core/java/android/content/ContextWrapper.java

+0 −1
Original line number Diff line number Diff line
@@ -953,7 +953,6 @@ public class ContextWrapper extends Context { 
    }



    @Override

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

    public Object getSystemService(String name) {

        return mBase.getSystemService(name);

    }