From bf915ec856e213447bbb800e680168b1fe096548 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 15 Nov 2024 12:32:13 +0000 Subject: Remove TODO(b/347269120)s as they will no longer be done Change https://r.android.com/3139200 added the TODOs as the intent was to add `@Nullable` back on the methods. However, doing so would break too many applications so it is not considered worth the effort so this change is cleaning up the unnecessary TODOs. Bug: 347269120 Test: m checkapi Merged-In: Ibeb0380f8d14ebb9a4c05f7b9a26632e38affd2f Change-Id: Ibeb0380f8d14ebb9a4c05f7b9a26632e38affd2f --- core/java/android/content/Context.java | 2 -- core/java/android/content/ContextWrapper.java | 1 - 2 files changed, 3 deletions(-) diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 744f019a4988..2a5c533df017 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4484,7 +4484,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); /** @@ -4529,7 +4528,6 @@ public abstract class Context { * never throw a {@link RuntimeException} if the name is not supported. */ @SuppressWarnings("unchecked") - // TODO(b/347269120): Re-add @Nullable public final T getSystemService(@NonNull Class serviceClass) { // Because subclasses may override getSystemService(String) we cannot // perform a lookup by class alone. We must first map the class to its diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 79fa6ea4d157..77aa62886399 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -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); } -- cgit v1.2.3-59-g8ed1b