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

Commit 33fe4ed7 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Temporarily remove @Nullable from findViewById(int) methods" into main... 

Merge "Temporarily remove @Nullable from findViewById(int) methods" into main am: a8da8e6c am: 29aa7475

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



Change-Id: I9c852b21d4551a6c0ad7c141d8145e329604b476
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 590199f5 29aa7475

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -3701,7 +3701,7 @@ public class Activity extends ContextThemeWrapper 
     * @see View#findViewById(int)

     * @see Activity#requireViewById(int)

     */

    @Nullable

    /* TODO(b/347672184): Re-add @Nullable */

    public <T extends View> T findViewById(@IdRes int id) {

        return getWindow().findViewById(id);

    }

core/java/android/app/Dialog.java

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ public class Dialog implements DialogInterface, Window.Callback, 
     * @see View#findViewById(int)

     * @see Dialog#requireViewById(int)

     */

    @Nullable

    /* TODO(b/347672184): Re-add @Nullable */

    public <T extends View> T findViewById(@IdRes int id) {

        return mWindow.findViewById(id);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ public class DreamService extends Service implements Window.Callback { 
     * @see View#findViewById(int)

     * @see DreamService#requireViewById(int)

     */

    @Nullable

    /* TODO(b/347672184): Re-add @Nullable */

    public <T extends View> T findViewById(@IdRes int id) {

        return getWindow().findViewById(id);

    }

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -27534,7 +27534,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @return a view with given ID if found, or {@code null} otherwise

     * @see View#requireViewById(int)

     */

    @Nullable

    /* TODO(b/347672184): Re-add @Nullable */

    public final <T extends View> T findViewById(@IdRes int id) {

        if (id == NO_ID) {

            return null;

core/java/android/view/Window.java

+1 −1
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ public abstract class Window { 
     * @see View#findViewById(int)

     * @see Window#requireViewById(int)

     */

    @Nullable

    /* TODO(b/347672184): Re-add @Nullable */

    public <T extends View> T findViewById(@IdRes int id) {

        return getDecorView().findViewById(id);

    }