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

Commit f9525bd3 authored Jul 16, 2024 by Paul Duffin Committed by Automerger Merge Worker Jul 16, 2024

Merge "Remove TODO(b/347672184) and explain why @Nullable is not used" into main am: f8a9a6f8

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

Change-Id: I187d823fe45ef9c4e2e51f5eba08e8fda4a35785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 2909a118 f8a9a6f8

core/java/android/app/Activity.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -3701,7 +3701,9 @@ public class Activity extends ContextThemeWrapper
		* @see View#findViewById(int)
		* @see Activity#requireViewById(int)
		*/
		/* TODO(b/347672184): Re-add @Nullable */
		// Strictly speaking this should be marked as @Nullable but the nullability of the return value
		// is deliberately left unspecified as idiomatically correct code can make assumptions either
		// way based on local context, e.g. layout specification.
		public <T extends View> T findViewById(@IdRes int id) {
		return getWindow().findViewById(id);
		}

core/java/android/app/Dialog.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -565,7 +565,9 @@ public class Dialog implements DialogInterface, Window.Callback,
		* @see View#findViewById(int)
		* @see Dialog#requireViewById(int)
		*/
		/* TODO(b/347672184): Re-add @Nullable */
		// Strictly speaking this should be marked as @Nullable but the nullability of the return value
		// is deliberately left unspecified as idiomatically correct code can make assumptions either
		// way based on local context, e.g. layout specification.
		public <T extends View> T findViewById(@IdRes int id) {
		return mWindow.findViewById(id);
		}

core/java/android/service/dreams/DreamService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -738,7 +738,9 @@ public class DreamService extends Service implements Window.Callback {
		* @see View#findViewById(int)
		* @see DreamService#requireViewById(int)
		*/
		/* TODO(b/347672184): Re-add @Nullable */
		// Strictly speaking this should be marked as @Nullable but the nullability of the return value
		// is deliberately left unspecified as idiomatically correct code can make assumptions either
		// way based on local context, e.g. layout specification.
		public <T extends View> T findViewById(@IdRes int id) {
		return getWindow().findViewById(id);
		}

core/java/android/view/View.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -27534,7 +27534,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @return a view with given ID if found, or {@code null} otherwise
		* @see View#requireViewById(int)
		*/
		/* TODO(b/347672184): Re-add @Nullable */
		// Strictly speaking this should be marked as @Nullable but the nullability of the return value
		// is deliberately left unspecified as idiomatically correct code can make assumptions either
		// way based on local context, e.g. layout specification.
		public final <T extends View> T findViewById(@IdRes int id) {
		if (id == NO_ID) {
		return null;

core/java/android/view/Window.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -1722,7 +1722,9 @@ public abstract class Window {
		* @see View#findViewById(int)
		* @see Window#requireViewById(int)
		*/
		/* TODO(b/347672184): Re-add @Nullable */
		// Strictly speaking this should be marked as @Nullable but the nullability of the return value
		// is deliberately left unspecified as idiomatically correct code can make assumptions either
		// way based on local context, e.g. layout specification.
		public <T extends View> T findViewById(@IdRes int id) {
		return getDecorView().findViewById(id);
		}