From c051955392840cb94bd6f0b2a8107a48d2ffc8b0 Mon Sep 17 00:00:00 2001 From: Scott Kennedy Date: Wed, 11 Feb 2015 15:33:10 -0800 Subject: Mark findViewById(int) @Nullable Change-Id: I9bf7c08a896bd9c28400ff832179abc579fd502f --- core/java/android/app/Activity.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/java/android/app/Activity.java') diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index e95fbfc..aa1c70e 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -743,6 +743,7 @@ public class Activity extends ContextThemeWrapper final FragmentManagerImpl mFragments = new FragmentManagerImpl(); final FragmentContainer mContainer = new FragmentContainer() { @Override + @Nullable public View findViewById(int id) { return Activity.this.findViewById(id); } @@ -2068,6 +2069,7 @@ public class Activity extends ContextThemeWrapper * * @return The view if found or null otherwise. */ + @Nullable public View findViewById(int id) { return getWindow().findViewById(id); } -- cgit v1.1