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

Commit 9f1a564b authored by Xin Li's avatar Xin Li Committed by Automerger Merge Worker
Browse files

Merge "Remove TODO(b/347269120)s as they will no longer be done" into... 

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

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



Change-Id: I5b4dc5ce3cdd54736ec93ff78846fe830b3130b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1491487 42ff650a

core/java/android/content/Context.java

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

     * @see android.security.authenticationpolicy.AuthenticationPolicyManager

     */

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

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



    /**
@@ -4576,7 +4575,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
@@ -960,7 +960,6 @@ public class ContextWrapper extends Context { 
    }



    @Override

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

    public Object getSystemService(String name) {

        return mBase.getSystemService(name);

    }