Merge "Update the Builder to add the title parameter checking"

1 files changed, 5 insertions, 4 deletions

diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java
index e48becf18d7f..15576182c53a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java
@@ -99,7 +99,7 @@ public class FooterPreference extends Preference {
          * To set the key value of the {@link FooterPreference}.
          * @param key The key value.
          */
-        public Builder setKey(String key) {
+        public Builder setKey(@NonNull String key) {
             mKey = key;
             return this;
         }
@@ -128,12 +128,13 @@ public class FooterPreference extends Preference {
         public FooterPreference build() {
             final FooterPreference footerPreference = new FooterPreference(mContext);
             footerPreference.setSelectable(false);
+            if (TextUtils.isEmpty(mTitle)) {
+                throw new IllegalArgumentException("Footer title cannot be empty!");
+            }
+            footerPreference.setTitle(mTitle);
             if (!TextUtils.isEmpty(mKey)) {
                 footerPreference.setKey(mKey);
             }
-            if (!TextUtils.isEmpty(mTitle)) {
-                footerPreference.setTitle(mTitle);
-            }
             return footerPreference;
         }
     }