Messaging: Nullability

Change-Id: I8bcde2a868a9c8989971d056be24ff4986e4f8f3

src/android/support/v7/mms/pdu/EncodedStringValue.java

@@ -20,6 +20,8 @@ package android.support.v7.mms.pdu;
 
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -187,6 +189,7 @@ public class EncodedStringValue implements Cloneable {
      * (non-Javadoc)
      * @see java.lang.Object#clone()
      */
+    @NonNull
     @Override
     public Object clone() throws CloneNotSupportedException {
         int len = mData.length;

src/com/android/messaging/BugleApplication.java

@@ -29,6 +29,8 @@ import android.support.v7.mms.CarrierConfigValuesLoader;
 import android.support.v7.mms.MmsManager;
 import android.telephony.CarrierConfigManager;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.receiver.SmsReceiver;
 import com.android.messaging.sms.ApnDatabase;
@@ -69,7 +71,7 @@ public class BugleApplication extends Application implements UncaughtExceptionHa
     }
 
     @Override
-    public void onConfigurationChanged(final Configuration newConfig) {
+    public void onConfigurationChanged(@NonNull final Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
         // Update conversation drawables when changing writing systems
@@ -160,7 +162,7 @@ public class BugleApplication extends Application implements UncaughtExceptionHa
     }
 
     @Override
-    public void uncaughtException(final Thread thread, final Throwable ex) {
+    public void uncaughtException(@NonNull final Thread thread, @NonNull final Throwable ex) {
         final boolean background = getMainLooper().getThread() != thread;
         if (background) {
             LogUtil.e(TAG, "Uncaught exception in background thread " + thread, ex);

src/com/android/messaging/datamodel/FileProvider.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +25,8 @@ import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -106,7 +109,7 @@ public abstract class FileProvider extends ContentProvider {
     }
 
     @Override
-    public ParcelFileDescriptor openFile(final Uri uri, final String fileMode)
+    public ParcelFileDescriptor openFile(final Uri uri, @NonNull final String fileMode)
             throws FileNotFoundException {
         final String fileId = uri.getPath();
         if (isValidFileId(fileId)) {
@@ -124,27 +127,27 @@ public abstract class FileProvider extends ContentProvider {
     }
 
     @Override
-    public Cursor query(final Uri uri, final String[] projection, final String selection,
+    public Cursor query(@NonNull final Uri uri, final String[] projection, final String selection,
-            final String[] selectionArgs, final String sortOrder) {
+                        final String[] selectionArgs, final String sortOrder) {
         // Don't support queries.
         return null;
     }
 
     @Override
-    public Uri insert(final Uri uri, final ContentValues values) {
+    public Uri insert(@NonNull final Uri uri, final ContentValues values) {
         // Don't support inserts.
         return null;
     }
 
     @Override
-    public int update(final Uri uri, final ContentValues values, final String selection,
+    public int update(@NonNull final Uri uri, final ContentValues values, final String selection,
-            final String[] selectionArgs) {
+                      final String[] selectionArgs) {
         // Don't support updates.
         return 0;
     }
 
     @Override
-    public String getType(final Uri uri) {
+    public String getType(@NonNull final Uri uri) {
         // No need for mime types.
         return null;
     }

src/com/android/messaging/datamodel/MediaScratchFileProvider.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,8 @@ import android.database.MatrixCursor;
 import android.database.MatrixCursor.RowBuilder;
 import android.net.Uri;
 import android.provider.OpenableColumns;
+
+import androidx.annotation.NonNull;
 import androidx.collection.SimpleArrayMap;
 import android.text.TextUtils;
 
@@ -114,8 +117,8 @@ public class MediaScratchFileProvider extends FileProvider {
     }
 
     @Override
-    public Cursor query(final Uri uri, final String[] projection, final String selection,
+    public Cursor query(@NonNull final Uri uri, final String[] projection, final String selection,
-            final String[] selectionArgs, final String sortOrder) {
+                        final String[] selectionArgs, final String sortOrder) {
         if (projection != null && projection.length > 0 &&
                 TextUtils.equals(projection[0], OpenableColumns.DISPLAY_NAME) &&
                 isMediaScratchSpaceUri(uri)) {

src/com/android/messaging/datamodel/MessagingContentProvider.java

@@ -27,6 +27,8 @@ import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.DatabaseHelper.ConversationColumns;
 import com.android.messaging.datamodel.DatabaseHelper.ConversationParticipantsColumns;
@@ -250,8 +252,8 @@ public class MessagingContentProvider extends ContentProvider {
     }
 
     @Override
-    public Cursor query(final Uri uri, final String[] projection, String selection,
+    public Cursor query(@NonNull final Uri uri, final String[] projection, String selection,
-            final String[] selectionArgs, String sortOrder) {
+                        final String[] selectionArgs, String sortOrder) {
 
         // Processes other than self are allowed to temporarily access the media
         // scratch space; we grant uri read access on a case-by-case basis. Dialer app and
@@ -376,7 +378,7 @@ public class MessagingContentProvider extends ContentProvider {
     }
 
     @Override
-    public String getType(final Uri uri) {
+    public String getType(@NonNull final Uri uri) {
         final StringBuilder sb = new
                 StringBuilder("vnd.android.cursor.dir/vnd.android.messaging.");
 
@@ -397,24 +399,24 @@ public class MessagingContentProvider extends ContentProvider {
     }
 
     @Override
-    public ParcelFileDescriptor openFile(final Uri uri, final String fileMode)
+    public ParcelFileDescriptor openFile(@NonNull final Uri uri, @NonNull final String fileMode)
             throws FileNotFoundException {
         throw new IllegalArgumentException("openFile not supported: " + uri);
     }
 
     @Override
-    public Uri insert(final Uri uri, final ContentValues values) {
+    public Uri insert(@NonNull final Uri uri, final ContentValues values) {
         throw new IllegalStateException("Insert not supported " + uri);
     }
 
     @Override
-    public int delete(final Uri uri, final String selection, final String[] selectionArgs) {
+    public int delete(@NonNull final Uri uri, final String selection, final String[] selectionArgs) {
         throw new IllegalArgumentException("Delete not supported: " + uri);
     }
 
     @Override
-    public int update(final Uri uri, final ContentValues values, final String selection,
+    public int update(@NonNull final Uri uri, final ContentValues values, final String selection,
-            final String[] selectionArgs) {
+                      final String[] selectionArgs) {
         throw new IllegalArgumentException("Update not supported: " + uri);
     }
 

src/com/android/messaging/datamodel/action/ActionServiceImpl.java

@@ -25,6 +25,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.SystemClock;
 
+import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
 
 import com.android.messaging.Factory;
@@ -238,7 +239,7 @@ public class ActionServiceImpl extends JobIntentService {
      * {@inheritDoc}
      */
     @Override
-    protected void onHandleWork(final Intent intent) {
+    protected void onHandleWork(@NonNull final Intent intent) {
         if (intent == null) {
             // Shouldn't happen but sometimes does following another crash.
             LogUtil.w(TAG, "ActionService.onHandleIntent: Called with null intent");

src/com/android/messaging/datamodel/action/BackgroundWorkerService.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
 
 import com.android.messaging.Factory;
@@ -102,12 +104,7 @@ public class BackgroundWorkerService extends JobIntentService {
     }
 
     @Override
-    protected void onHandleWork(final Intent intent) {
+    protected void onHandleWork(@NonNull final Intent intent) {
-        if (intent == null) {
-            // Shouldn't happen but sometimes does following another crash.
-            LogUtil.w(TAG, "BackgroundWorkerService.onHandleIntent: Called with null intent");
-            return;
-        }
         final int opcode = intent.getIntExtra(EXTRA_OP_CODE, 0);
 
         switch(opcode) {

src/com/android/messaging/datamodel/action/DeleteConversationAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.BugleNotifications;
@@ -204,7 +207,7 @@ public class DeleteConversationAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/DeleteMessageAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +23,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseWrapper;
@@ -129,7 +132,7 @@ public class DeleteMessageAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/DownloadMmsAction.java

@@ -24,6 +24,8 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
@@ -339,7 +341,7 @@ public class DownloadMmsAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/DumpDatabaseAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@ import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.DatabaseHelper;
 import com.android.messaging.util.DebugUtils;
@@ -118,7 +121,7 @@ public class DumpDatabaseAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/FixupMessageStatusOnStartupAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@ import android.content.ContentValues;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseHelper;
 import com.android.messaging.datamodel.DatabaseWrapper;
@@ -107,7 +110,7 @@ public class FixupMessageStatusOnStartupAction extends Action implements Parcela
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/GetOrCreateConversationAction.java

@@ -21,6 +21,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
@@ -168,7 +170,7 @@ public class GetOrCreateConversationAction extends Action implements Parcelable
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/HandleLowStorageAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +20,8 @@ package com.android.messaging.datamodel.action;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.sms.SmsReleaseStorage;
 import com.android.messaging.util.Assert;
 
@@ -88,7 +91,7 @@ public class HandleLowStorageAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/InsertNewMessageAction.java

@@ -24,6 +24,8 @@ import android.os.Parcelable;
 import android.provider.Telephony;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
@@ -474,7 +476,7 @@ public class InsertNewMessageAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/LogTelephonyDatabaseAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +25,8 @@ import android.os.Parcelable;
 import android.provider.Telephony.Threads;
 import android.provider.Telephony.ThreadsColumns;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.mmslib.SqliteWrapper;
 import com.android.messaging.util.DebugUtils;
@@ -147,7 +150,7 @@ public class LogTelephonyDatabaseAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/MarkAsReadAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@ import android.content.ContentValues;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.BugleNotifications;
 import com.android.messaging.datamodel.DataModel;
@@ -107,7 +110,7 @@ public class MarkAsReadAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/MarkAsSeenAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleNotifications;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseHelper;
@@ -120,7 +123,7 @@ public class MarkAsSeenAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/ProcessDeliveryReportAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.Telephony;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseHelper;
@@ -116,7 +119,7 @@ public class ProcessDeliveryReportAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/ProcessDownloadedMmsAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +28,8 @@ import android.provider.Telephony.Mms;
 import android.telephony.SmsManager;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.BugleNotifications;
@@ -578,7 +581,7 @@ public class ProcessDownloadedMmsAction extends Action {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/ProcessPendingMessagesAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +23,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.telephony.ServiceState;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
@@ -478,7 +481,7 @@ public class ProcessPendingMessagesAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/ProcessSentMessageAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +26,8 @@ import android.os.Parcelable;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.BugleNotifications;
@@ -306,7 +309,7 @@ public class ProcessSentMessageAction extends Action {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/ReadDraftDataAction.java

@@ -20,6 +20,8 @@ package com.android.messaging.datamodel.action;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseWrapper;
@@ -161,7 +163,7 @@ public class ReadDraftDataAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/ReceiveMmsMessageAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,8 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.BugleNotifications;
@@ -191,7 +194,7 @@ public class ReceiveMmsMessageAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +25,8 @@ import android.os.Parcelable;
 import android.provider.Telephony.Sms;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.BugleNotifications;
@@ -194,7 +197,7 @@ public class ReceiveSmsMessageAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/RedownloadMmsAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +23,8 @@ import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.BugleNotifications;
 import com.android.messaging.datamodel.DataModel;
@@ -125,7 +128,7 @@ public class RedownloadMmsAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/ResendMessageAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@ import android.content.ContentValues;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseHelper.MessageColumns;
@@ -125,7 +128,7 @@ public class ResendMessageAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/SendMessageAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +26,8 @@ import android.os.Parcelable;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.Sms;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
@@ -446,7 +449,7 @@ public class SendMessageAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/SyncMessagesAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +25,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.provider.Telephony.Mms;
+
+import androidx.annotation.NonNull;
 import androidx.collection.LongSparseArray;
 
 import com.android.messaging.Factory;
@@ -631,7 +634,7 @@ public class SyncMessagesAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/UpdateConversationArchiveStatusAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +20,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseWrapper;
@@ -87,7 +90,7 @@ public class UpdateConversationArchiveStatusAction extends Action {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/UpdateDestinationBlockedAction.java

@@ -20,6 +20,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseWrapper;
@@ -143,7 +145,7 @@ public class UpdateDestinationBlockedAction extends Action {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/UpdateMessageNotificationAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +19,8 @@ package com.android.messaging.datamodel.action;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleNotifications;
 
 /**
@@ -57,7 +60,7 @@ public class UpdateMessageNotificationAction extends Action {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/UpdateMessagePartSizeAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@ import android.content.ContentValues;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseHelper;
@@ -97,7 +100,7 @@ public class UpdateMessagePartSizeAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/action/WriteDraftMessageAction.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +20,8 @@ package com.android.messaging.datamodel.action;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.BugleDatabaseOperations;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.DatabaseWrapper;
@@ -98,7 +101,7 @@ public class WriteDraftMessageAction extends Action implements Parcelable {
     };
 
     @Override
-    public void writeToParcel(final Parcel parcel, final int flags) {
+    public void writeToParcel(@NonNull final Parcel parcel, final int flags) {
         writeActionToParcel(parcel, flags);
     }
 }

src/com/android/messaging/datamodel/data/ConversationMessageData.java

@@ -23,6 +23,8 @@ import android.provider.ContactsContract;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.DatabaseHelper;
 import com.android.messaging.datamodel.DatabaseHelper.MessageColumns;
 import com.android.messaging.datamodel.DatabaseHelper.PartColumns;
@@ -614,6 +616,7 @@ public class ConversationMessageData {
         return mCanClusterWithNextMessage;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return MessageData.toString(mMessageId, mParts);

src/com/android/messaging/datamodel/data/ConversationParticipantsData.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +18,8 @@
 package com.android.messaging.datamodel.data;
 
 import android.database.Cursor;
+
+import androidx.annotation.NonNull;
 import androidx.collection.SimpleArrayMap;
 
 import com.android.messaging.util.Assert;
@@ -97,6 +100,7 @@ public class ConversationParticipantsData implements Iterable<ParticipantData> {
         return !mConversationParticipantsMap.isEmpty();
     }
 
+    @NonNull
     @Override
     public Iterator<ParticipantData> iterator() {
         return new Iterator<ParticipantData>() {

src/com/android/messaging/datamodel/data/MessageData.java

@@ -25,6 +25,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.datamodel.DatabaseHelper;
 import com.android.messaging.datamodel.DatabaseHelper.MessageColumns;
 import com.android.messaging.datamodel.DatabaseWrapper;
@@ -909,6 +911,7 @@ public class MessageData implements Parcelable {
         }
     };
 
+    @NonNull
     @Override
     public String toString() {
         return toString(mMessageId, mParts);

src/com/android/messaging/datamodel/data/MessagePartData.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +26,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.datamodel.DatabaseHelper;
 import com.android.messaging.datamodel.DatabaseHelper.PartColumns;
@@ -521,6 +524,7 @@ public class MessagePartData implements Parcelable {
         }
     }
 
+    @NonNull
     @Override
     public String toString() {
         if (isText()) {

src/com/android/messaging/mmslib/pdu/EncodedStringValue.java

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +20,8 @@ package com.android.messaging.mmslib.pdu;
 
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -201,6 +204,7 @@ public class EncodedStringValue implements Cloneable {
      * (non-Javadoc)
      * @see java.lang.Object#clone()
      */
+    @NonNull
     @Override
     public Object clone() throws CloneNotSupportedException {
         int len = mData.length;

src/com/android/messaging/sms/SmsSender.java

@@ -27,6 +27,8 @@ import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.R;
 import com.android.messaging.receiver.SendStatusReceiver;
@@ -125,6 +127,7 @@ public class SmsSender {
             }
         }
 
+        @NonNull
         @Override
         public String toString() {
             final StringBuilder sb = new StringBuilder();

src/com/android/messaging/ui/BlockedParticipantsActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +20,8 @@ package com.android.messaging.ui;
 import android.os.Bundle;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 
 /**
@@ -35,7 +38,7 @@ public class BlockedParticipantsActivity extends BugleActionBarActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
                 // Treat the home press as back press so that when we go back to

src/com/android/messaging/ui/BugleActionBarActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +19,8 @@ package com.android.messaging.ui;
 
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import android.view.ActionMode;
@@ -194,7 +197,7 @@ public class BugleActionBarActivity extends AppCompatActivity implements ImeUtil
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem menuItem) {
         if (mActionMode != null &&
                 mActionMode.getCallback().onActionItemClicked(mActionMode, menuItem)) {
             return true;

src/com/android/messaging/ui/ClassZeroActivity.java

@@ -32,6 +32,8 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.Window;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.datamodel.action.ReceiveSmsMessageAction;
 import com.android.messaging.datamodel.BugleNotifications;
@@ -169,7 +171,7 @@ public class ClassZeroActivity extends Activity {
     }
 
     @Override
-    protected void onSaveInstanceState(final Bundle outState) {
+    protected void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putLong(TIMER_FIRE, mTimerSet);
         if (VERBOSE) {

src/com/android/messaging/ui/CursorRecyclerAdapter.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,8 @@ import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.DataSetObserver;
 import android.os.Handler;
+
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.ViewGroup;
@@ -185,13 +188,14 @@ public abstract class CursorRecyclerAdapter<VH extends RecyclerView.ViewHolder>
         }
     }
 
+    @NonNull
     @Override
-    public VH onCreateViewHolder(final ViewGroup parent, final int viewType) {
+    public VH onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) {
         return createViewHolder(mContext, parent, viewType);
     }
 
     @Override
-    public void onBindViewHolder(final VH holder, final int position) {
+    public void onBindViewHolder(@NonNull final VH holder, final int position) {
         if (!mDataValid) {
             throw new IllegalStateException("this should only be called when the cursor is valid");
         }

src/com/android/messaging/ui/FixedViewPagerAdapter.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +18,8 @@ package com.android.messaging.ui;
 
 import android.os.Bundle;
 import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
 import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,8 +42,9 @@ public class FixedViewPagerAdapter<T extends PagerViewHolder> extends PagerAdapt
         mViewHolders = viewHolders;
     }
 
+    @NonNull
     @Override
-    public Object instantiateItem(final ViewGroup container, final int position) {
+    public Object instantiateItem(@NonNull final ViewGroup container, final int position) {
         final PagerViewHolder viewHolder = getViewHolder(position);
         final View view = viewHolder.getView(container);
         if (view == null) {
@@ -52,7 +56,8 @@ public class FixedViewPagerAdapter<T extends PagerViewHolder> extends PagerAdapt
     }
 
     @Override
-    public void destroyItem(final ViewGroup container, final int position, final Object object) {
+    public void destroyItem(@NonNull final ViewGroup container, final int position,
+                            @NonNull final Object object) {
         final PagerViewHolder viewHolder = getViewHolder(position);
         final View destroyedView = viewHolder.destroyView();
         if (destroyedView != null) {
@@ -66,7 +71,7 @@ public class FixedViewPagerAdapter<T extends PagerViewHolder> extends PagerAdapt
     }
 
     @Override
-    public boolean isViewFromObject(final View view, final Object object) {
+    public boolean isViewFromObject(final View view, @NonNull final Object object) {
         return view.getTag() == object;
     }
 

src/com/android/messaging/ui/PermissionCheckActivity.java

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2015 The Android Open Source Project     
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +27,8 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.R;
 import com.android.messaging.util.OsUtil;
@@ -101,8 +104,9 @@ public class PermissionCheckActivity extends Activity {
     }
 
     @Override
-    public void onRequestPermissionsResult(
+    public void onRequestPermissionsResult(final int requestCode,
-            final int requestCode, final String permissions[], final int[] grantResults) {
+                                           @NonNull final String permissions[],
+                                           @NonNull final int[] grantResults) {
         if (requestCode == REQUIRED_PERMISSIONS_REQUEST_CODE) {
             // We do not use grantResults as some of the granted permissions might have been
             // revoked while the permissions dialog box was being shown for the missing permissions.

src/com/android/messaging/ui/SmsStorageLowWarningFragment.java

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2015 The Android Open Source Project     
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +34,8 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.datamodel.action.HandleLowStorageAction;
 import com.android.messaging.sms.SmsReleaseStorage;
@@ -127,8 +130,10 @@ public class SmsStorageLowWarningFragment extends Fragment {
                 super(context, R.layout.sms_free_storage_action_item_view, actions);
             }
 
+            @NonNull
             @Override
-            public View getView(final int position, final View view, final ViewGroup parent) {
+            public View getView(final int position, final View view,
+                                @NonNull final ViewGroup parent) {
                 TextView actionItemView;
                 if (view == null || !(view instanceof TextView)) {
                     final LayoutInflater inflater = LayoutInflater.from(getContext());

src/com/android/messaging/ui/SnackBarManager.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +36,8 @@ import android.view.WindowManager;
 import android.widget.PopupWindow;
 import android.widget.PopupWindow.OnDismissListener;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.R;
 import com.android.messaging.ui.SnackBar.Placement;
@@ -89,7 +92,7 @@ public class SnackBarManager {
     private final OnAttachStateChangeListener mAttachStateChangeListener =
             new OnAttachStateChangeListener() {
                 @Override
-                public void onViewDetachedFromWindow(View v) {
+                public void onViewDetachedFromWindow(@NonNull View v) {
                     // Dismiss the PopupWindow and clear SnackBarManager state.
                     mHideHandler.removeCallbacks(mDismissRunnable);
                     mPopupWindow.dismiss();
@@ -100,7 +103,7 @@ public class SnackBarManager {
                 }
 
                 @Override
-                public void onViewAttachedToWindow(View v) {}
+                public void onViewAttachedToWindow(@NonNull View v) {}
             };
 
     private final int mTranslationDurationMs;

src/com/android/messaging/ui/VCardDetailActivity.java

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2015 The Android Open Source Project      
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.util.Assert;
 
@@ -47,7 +50,7 @@ public class VCardDetailActivity extends BugleActionBarActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
                 // Treat the home press as back press so that when we go back to

src/com/android/messaging/ui/animation/PopupTransitionAnimation.java

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2015 The Android Open Source Project     
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +29,8 @@ import android.view.animation.Animation;
 import android.view.animation.Transformation;
 import android.widget.PopupWindow;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.util.LogUtil;
 import com.android.messaging.util.ThreadUtil;
 import com.android.messaging.util.UiUtils;
@@ -253,7 +256,7 @@ public class PopupTransitionAnimation extends Animation {
     private void initPopupWindow() {
         mPopupRoot = new View(mViewToAnimate.getContext()) {
             @Override
-            protected void onDraw(final Canvas canvas) {
+            protected void onDraw(@NonNull final Canvas canvas) {
                 canvas.save();
                 canvas.clipRect(getLeft(), mActionBarRect.bottom - mPopupRect.top, getRight(),
                         getBottom());

src/com/android/messaging/ui/appsettings/ApnEditorActivity.java

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2015 The Android Open Source Project     
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +30,8 @@ import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.provider.Telephony;
+
+import androidx.annotation.NonNull;
 import androidx.core.app.NavUtils;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -64,7 +67,7 @@ public class ApnEditorActivity extends BugleActionBarActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
                 NavUtils.navigateUpFromSameTask(this);

src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java

@@ -36,6 +36,8 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
+
+import androidx.annotation.NonNull;
 import androidx.core.app.NavUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -71,7 +73,7 @@ public class ApnSettingsActivity extends BugleActionBarActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         switch (item.getItemId()) {
         case android.R.id.home:
             NavUtils.navigateUpFromSameTask(this);

src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +26,8 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.provider.Settings;
+
+import androidx.annotation.NonNull;
 import androidx.core.app.NavUtils;
 import android.text.TextUtils;
 import android.view.Menu;
@@ -65,7 +68,7 @@ public class ApplicationSettingsActivity extends BugleActionBarActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         switch (item.getItemId()) {
         case android.R.id.home:
             NavUtils.navigateUpFromSameTask(this);

src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java

@@ -33,6 +33,7 @@ import android.support.v7.mms.MmsManager;
 import android.text.TextUtils;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
 import androidx.core.app.NavUtils;
 
 import com.android.messaging.Factory;
@@ -70,7 +71,7 @@ public class PerSubscriptionSettingsActivity extends BugleActionBarActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         switch (item.getItemId()) {
         case android.R.id.home:
             NavUtils.navigateUpFromSameTask(this);

src/com/android/messaging/ui/appsettings/SettingsActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +20,8 @@ package com.android.messaging.ui.appsettings;
 import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.core.app.NavUtils;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -71,7 +74,7 @@ public class SettingsActivity extends BugleActionBarActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         switch (item.getItemId()) {
         case android.R.id.home:
             NavUtils.navigateUpFromSameTask(this);
@@ -128,9 +131,10 @@ public class SettingsActivity extends BugleActionBarActivity {
                 notifyDataSetChanged();
             }
 
+            @NonNull
             @Override
             public View getView(final int position, final View convertView,
-                    final ViewGroup parent) {
+                                @NonNull final ViewGroup parent) {
                 View itemView;
                 if (convertView != null) {
                     itemView = convertView;

src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java

@@ -21,6 +21,8 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -165,8 +167,10 @@ public class AttachmentChooserFragment extends Fragment implements DraftMessageD
             notifyDataSetChanged();
         }
 
+        @NonNull
         @Override
-        public View getView(final int position, final View convertView, final ViewGroup parent) {
+        public View getView(final int position, final View convertView,
+                            @NonNull final ViewGroup parent) {
             AttachmentGridItemView itemView;
             final MessagePartData item = getItem(position);
             if (convertView != null && convertView instanceof AttachmentGridItemView) {

src/com/android/messaging/ui/conversation/ComposeMessageView.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@ import android.content.res.Resources;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import android.text.Editable;
 import android.text.Html;
@@ -284,7 +287,8 @@ public class ComposeMessageView extends LinearLayout
         });
         mSendButton.setAccessibilityDelegate(new AccessibilityDelegate() {
             @Override
-            public void onPopulateAccessibilityEvent(View host, AccessibilityEvent event) {
+            public void onPopulateAccessibilityEvent(@NonNull View host,
+                                                     @NonNull AccessibilityEvent event) {
                 super.onPopulateAccessibilityEvent(host, event);
                 // When the send button is long clicked, we want TalkBack to announce the real
                 // action (select SIM or edit subject), as opposed to "long press send button."

src/com/android/messaging/ui/conversation/ConversationActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +23,8 @@ import android.content.Intent;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import android.text.TextUtils;
 import android.view.MenuItem;
@@ -119,7 +122,7 @@ public class ConversationActivity extends BugleActionBarActivity
     }
 
     @Override
-    protected void onSaveInstanceState(final Bundle outState) {
+    protected void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
         // After onSaveInstanceState() is called, future changes to mUiState won't update the UI
         // anymore, because fragment transactions are not allowed past this point.
@@ -187,7 +190,7 @@ public class ConversationActivity extends BugleActionBarActivity
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem menuItem) {
         if (super.onOptionsItemSelected(menuItem)) {
             return true;
         }

src/com/android/messaging/ui/conversation/ConversationActivityUiState.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +19,8 @@ package com.android.messaging.ui.conversation;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.ui.contact.ContactPickerFragment;
 import com.android.messaging.util.Assert;
 import com.google.common.annotations.VisibleForTesting;
@@ -285,6 +288,7 @@ public class ConversationActivityUiState implements Parcelable, Cloneable {
         }
     };
 
+    @NonNull
     @Override
     protected ConversationActivityUiState clone() {
         try {

src/com/android/messaging/ui/conversation/ConversationFastScroller.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,8 @@ import android.content.res.Resources;
 import android.graphics.Rect;
 import android.graphics.drawable.StateListDrawable;
 import android.os.Handler;
+
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
@@ -169,7 +172,7 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
     }
 
     @Override
-    public void onScrollStateChanged(final RecyclerView view, final int newState) {
+    public void onScrollStateChanged(@NonNull final RecyclerView view, final int newState) {
         if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
             // Only show the scrollbar once the user starts scrolling
             if (!mVisible && isEnabled()) {
@@ -257,7 +260,7 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
     }
 
     @Override
-    public void onScrolled(final RecyclerView view, final int dx, final int dy) {
+    public void onScrolled(@NonNull final RecyclerView view, final int dx, final int dy) {
         updateScrollPos();
     }
 
@@ -315,7 +318,7 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
     }
 
     @Override
-    public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
+    public boolean onInterceptTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) {
         if (!mVisible) {
             return false;
         }
@@ -357,7 +360,7 @@ public class ConversationFastScroller extends RecyclerView.OnScrollListener impl
     }
 
     @Override
-    public void onTouchEvent(RecyclerView rv, MotionEvent e) {
+    public void onTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) {
         if (!mDragging) {
             return;
         }

src/com/android/messaging/ui/conversation/ConversationFragment.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +44,8 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.core.text.BidiFormatter;
 import androidx.core.text.TextDirectionHeuristicsCompat;
@@ -245,7 +248,7 @@ public class ConversationFragment extends Fragment implements ConversationDataLi
             private int mScrollState = RecyclerView.SCROLL_STATE_IDLE;
 
             @Override
-            public void onScrollStateChanged(final RecyclerView view, final int newState) {
+            public void onScrollStateChanged(@NonNull final RecyclerView view, final int newState) {
                 if (newState == RecyclerView.SCROLL_STATE_IDLE) {
                     // Reset scroll states.
                     mCumulativeScrollDelta = 0;
@@ -257,7 +260,7 @@ public class ConversationFragment extends Fragment implements ConversationDataLi
             }
 
             @Override
-            public void onScrolled(final RecyclerView view, final int dx, final int dy) {
+            public void onScrolled(@NonNull final RecyclerView view, final int dx, final int dy) {
                 if (mScrollState == RecyclerView.SCROLL_STATE_DRAGGING &&
                         !mScrollToDismissHandled) {
                     mCumulativeScrollDelta += dy;

src/com/android/messaging/ui/conversation/ConversationMessageBubbleView.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,8 @@ import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.annotation.VisibleForAnimation;
 import com.android.messaging.datamodel.data.ConversationMessageBubbleData;
@@ -104,11 +107,11 @@ public class ConversationMessageBubbleView extends LinearLayout {
         mAnimator.setDuration(UiUtils.MEDIAPICKER_TRANSITION_DURATION);
         mAnimator.addListener(new AnimatorListener() {
             @Override
-            public void onAnimationStart(Animator animator) {
+            public void onAnimationStart(@NonNull Animator animator) {
             }
 
             @Override
-            public void onAnimationEnd(Animator animator) {
+            public void onAnimationEnd(@NonNull Animator animator) {
                 mAnimator = null;
                 mMorphedWidth = 0;
                 // Allow the bubble to resize if, for example, the status text changed during
@@ -120,11 +123,11 @@ public class ConversationMessageBubbleView extends LinearLayout {
             }
 
             @Override
-            public void onAnimationCancel(Animator animator) {
+            public void onAnimationCancel(@NonNull Animator animator) {
             }
 
             @Override
-            public void onAnimationRepeat(Animator animator) {
+            public void onAnimationRepeat(@NonNull Animator animator) {
             }
         });
         mAnimator.start();

src/com/android/messaging/ui/conversation/SimSelectorView.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +27,8 @@ import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.datamodel.data.SubscriptionListData;
 import com.android.messaging.datamodel.data.SubscriptionListData.SubscriptionListEntry;
@@ -140,8 +143,10 @@ public class SimSelectorView extends FrameLayout implements SimSelectorItemView.
             notifyDataSetChanged();
         }
 
+        @NonNull
         @Override
-        public View getView(final int position, final View convertView, final ViewGroup parent) {
+        public View getView(final int position, final View convertView,
+                            @NonNull final ViewGroup parent) {
             SimSelectorItemView itemView;
             if (convertView != null && convertView instanceof SimSelectorItemView) {
                 itemView = (SimSelectorItemView) convertView;

src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +18,8 @@ package com.android.messaging.ui.conversationlist;
 
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -71,7 +74,7 @@ public class ArchivedConversationListActivity extends AbstractConversationListAc
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem menuItem) {
+    public boolean onOptionsItemSelected(@NonNull MenuItem menuItem) {
         switch(menuItem.getItemId()) {
             case R.id.action_debug_options:
                 onActionBarDebug();

src/com/android/messaging/ui/conversationlist/ConversationListActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +19,8 @@ package com.android.messaging.ui.conversationlist;
 
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -83,7 +86,7 @@ public class ConversationListActivity extends AbstractConversationListActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem menuItem) {
         switch(menuItem.getItemId()) {
             case R.id.action_start_new_conversation:
                 onActionBarStartNewConversation();

src/com/android/messaging/ui/conversationlist/ConversationListFragment.java

@@ -24,6 +24,8 @@ import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewGroupCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -195,7 +197,8 @@ public class ConversationListFragment extends Fragment implements ConversationLi
             int mCurrentState = AbsListView.OnScrollListener.SCROLL_STATE_IDLE;
 
             @Override
-            public void onScrolled(final RecyclerView recyclerView, final int dx, final int dy) {
+            public void onScrolled(@NonNull final RecyclerView recyclerView, final int dx,
+                                   final int dy) {
                 if (mCurrentState == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL
                         || mCurrentState == AbsListView.OnScrollListener.SCROLL_STATE_FLING) {
                     ImeUtil.get().hideImeKeyboard(getActivity(), mRecyclerView);
@@ -209,7 +212,8 @@ public class ConversationListFragment extends Fragment implements ConversationLi
             }
 
             @Override
-            public void onScrollStateChanged(final RecyclerView recyclerView, final int newState) {
+            public void onScrollStateChanged(@NonNull final RecyclerView recyclerView,
+                                             final int newState) {
                 mCurrentState = newState;
             }
         });
@@ -326,7 +330,8 @@ public class ConversationListFragment extends Fragment implements ConversationLi
     }
 
     @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull final Menu menu,
+                                    @NonNull final MenuInflater inflater) {
         if (!isAdded()) {
             // Guard against being called before we're added to the activity
             return;

src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,8 @@ import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
 import android.content.Context;
 import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
@@ -81,7 +84,8 @@ public class ConversationListSwipeHelper implements OnItemTouchListener {
     }
 
     @Override
-    public boolean onInterceptTouchEvent(final RecyclerView recyclerView, final MotionEvent event) {
+    public boolean onInterceptTouchEvent(@NonNull final RecyclerView recyclerView,
+                                         final MotionEvent event) {
         if (event.getPointerCount() > 1) {
             // Ignore subsequent pointers.
             return false;
@@ -169,7 +173,8 @@ public class ConversationListSwipeHelper implements OnItemTouchListener {
     }
 
     @Override
-    public void onTouchEvent(final RecyclerView recyclerView, final MotionEvent event) {
+    public void onTouchEvent(@NonNull final RecyclerView recyclerView,
+                             @NonNull final MotionEvent event) {
         // We should only be here if we intercepted the touch due to swipe.
         Assert.isTrue(mIsSwiping);
 
@@ -459,4 +464,4 @@ public class ConversationListSwipeHelper implements OnItemTouchListener {
     private float getLastComputedXVelocity() {
         return mVelocityTracker.getXVelocity();
     }
-}
+}

src/com/android/messaging/ui/conversationsettings/PeopleAndOptionsActivity.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@ import android.app.Fragment;
 import android.os.Bundle;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.ui.BugleActionBarActivity;
 import com.android.messaging.ui.UIIntents;
@@ -51,7 +54,7 @@ public class PeopleAndOptionsActivity extends BugleActionBarActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
                 // Treat the home press as back press so that when we go back to

src/com/android/messaging/ui/conversationsettings/PeopleAndOptionsFragment.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +36,8 @@ import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.binding.Binding;
@@ -246,8 +249,10 @@ public class PeopleAndOptionsFragment extends Fragment
             notifyDataSetChanged();
         }
 
+        @NonNull
         @Override
-        public View getView(final int position, final View convertView, final ViewGroup parent) {
+        public View getView(final int position, final View convertView,
+                            @NonNull final ViewGroup parent) {
             PersonItemView itemView;
             final ParticipantData item = getItem(position);
             if (convertView != null && convertView instanceof PersonItemView) {

src/com/android/messaging/ui/debug/DebugSmsMmsFromDumpFileDialogFragment.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +35,8 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.datamodel.action.ReceiveMmsMessageAction;
 import com.android.messaging.datamodel.data.ParticipantData;
@@ -96,8 +99,9 @@ public class DebugSmsMmsFromDumpFileDialogFragment extends DialogFragment {
             super(context, R.layout.sms_mms_dump_file_list_item, dumpFiles);
         }
 
+        @NonNull
         @Override
-        public View getView(final int position, final View view, final ViewGroup parent) {
+        public View getView(final int position, final View view, @NonNull final ViewGroup parent) {
             TextView actionItemView;
             if (view == null || !(view instanceof TextView)) {
                 final LayoutInflater inflater = LayoutInflater.from(getContext());

src/com/android/messaging/ui/mediapicker/CameraMediaChooserView.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +25,9 @@ import android.os.Parcelable;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.ui.PersistentInstanceState;
 import com.android.messaging.util.ThreadUtil;
@@ -72,7 +76,7 @@ public class CameraMediaChooserView extends FrameLayout implements PersistentIns
     }
 
     @Override
-    protected void onDraw(final Canvas canvas) {
+    protected void onDraw(@NonNull final Canvas canvas) {
         super.onDraw(canvas);
         // If the canvas isn't hardware accelerated, we have to replace the HardwareCameraPreview
         // with a SoftwareCameraPreview which supports software rendering

src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java

@@ -31,6 +31,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.datamodel.DataModel;
 import com.android.messaging.datamodel.data.GalleryGridItemData;
@@ -107,7 +109,7 @@ public class GalleryGridItemView extends FrameLayout {
                 final Rect region = new Rect(0, 0, getWidth(), getHeight());
                 setTouchDelegate(new TouchDelegate(region, mCheckBox) {
                     @Override
-                    public boolean onTouchEvent(MotionEvent event) {
+                    public boolean onTouchEvent(@NonNull MotionEvent event) {
                         switch (event.getAction()) {
                             case MotionEvent.ACTION_DOWN:
                                 setPressed(true);

src/com/android/messaging/ui/mediapicker/HardwareCameraPreview.java

@@ -25,6 +25,8 @@ import android.util.AttributeSet;
 import android.view.TextureView;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+
 import java.io.IOException;
 
 /**
@@ -44,23 +46,25 @@ public class HardwareCameraPreview extends TextureView implements CameraPreview.
         mPreview = new CameraPreview(this);
         setSurfaceTextureListener(new SurfaceTextureListener() {
             @Override
-            public void onSurfaceTextureAvailable(final SurfaceTexture surfaceTexture, final int i, final int i2) {
+            public void onSurfaceTextureAvailable(@NonNull final SurfaceTexture surfaceTexture,
+                                                  final int i, final int i2) {
                 CameraManager.get().setSurface(mPreview);
             }
 
             @Override
-            public void onSurfaceTextureSizeChanged(final SurfaceTexture surfaceTexture, final int i, final int i2) {
+            public void onSurfaceTextureSizeChanged(@NonNull final SurfaceTexture surfaceTexture,
+                                                    final int i, final int i2) {
                 CameraManager.get().setSurface(mPreview);
             }
 
             @Override
-            public boolean onSurfaceTextureDestroyed(final SurfaceTexture surfaceTexture) {
+            public boolean onSurfaceTextureDestroyed(@NonNull final SurfaceTexture surfaceTexture) {
                 CameraManager.get().setSurface(null);
                 return true;
             }
 
             @Override
-            public void onSurfaceTextureUpdated(final SurfaceTexture surfaceTexture) {
+            public void onSurfaceTextureUpdated(@NonNull final SurfaceTexture surfaceTexture) {
                 CameraManager.get().setSurface(mPreview);
             }
         });

src/com/android/messaging/ui/mediapicker/MediaPicker.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +23,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+
+import androidx.annotation.NonNull;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import androidx.appcompat.app.ActionBar;
@@ -708,8 +711,9 @@ public class MediaPicker extends Fragment implements DraftMessageSubscriptionDat
     protected static final int READ_CONTACT_PERMISSION_REQUEST_CODE = 5;
 
     @Override
-    public void onRequestPermissionsResult(
+    public void onRequestPermissionsResult(final int requestCode,
-            final int requestCode, final String permissions[], final int[] grantResults) {
+                                           @NonNull final String permissions[],
+                                           @NonNull final int[] grantResults) {
         if (mSelectedChooser != null) {
             mSelectedChooser.onRequestPermissionsResult(requestCode, permissions, grantResults);
         }

src/com/android/messaging/ui/mediapicker/SoftwareCameraPreview.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,8 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+
 import java.io.IOException;
 
 /**
@@ -41,18 +44,18 @@ public class SoftwareCameraPreview extends SurfaceView implements CameraPreview.
         mPreview = new CameraPreview(this);
         getHolder().addCallback(new SurfaceHolder.Callback() {
             @Override
-            public void surfaceCreated(final SurfaceHolder surfaceHolder) {
+            public void surfaceCreated(@NonNull final SurfaceHolder surfaceHolder) {
                 CameraManager.get().setSurface(mPreview);
             }
 
             @Override
-            public void surfaceChanged(final SurfaceHolder surfaceHolder, final int format, final int width,
+            public void surfaceChanged(@NonNull final SurfaceHolder surfaceHolder, final int format,
-                                       final int height) {
+                                       final int width, final int height) {
                 CameraManager.get().setSurface(mPreview);
             }
 
             @Override
-            public void surfaceDestroyed(final SurfaceHolder surfaceHolder) {
+            public void surfaceDestroyed(@NonNull final SurfaceHolder surfaceHolder) {
                 CameraManager.get().setSurface(null);
             }
         });
@@ -60,7 +63,7 @@ public class SoftwareCameraPreview extends SurfaceView implements CameraPreview.
 
 
     @Override
-    protected void onVisibilityChanged(final View changedView, final int visibility) {
+    protected void onVisibilityChanged(@NonNull final View changedView, final int visibility) {
         super.onVisibilityChanged(changedView, visibility);
         mPreview.onVisibilityChanged(visibility);
     }

src/com/android/messaging/ui/mediapicker/SoundLevels.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +30,8 @@ import android.util.Log;
 import android.view.View;
 import android.view.accessibility.AccessibilityNodeInfo;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.R;
 import com.android.messaging.util.LogUtil;
 
@@ -114,7 +117,7 @@ public class SoundLevels extends View {
     }
 
     @Override
-    protected void onDraw(final Canvas canvas) {
+    protected void onDraw(@NonNull final Canvas canvas) {
         if (!mIsEnabled) {
             return;
         }

src/com/android/messaging/ui/mediapicker/camerafocus/RenderOverlay.java

@@ -24,6 +24,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -160,7 +162,7 @@ public class RenderOverlay extends FrameLayout {
         }
 
         @Override
-        public void draw(Canvas canvas) {
+        public void draw(@NonNull Canvas canvas) {
             super.draw(canvas);
             if (mClients == null) {
                 return;

src/com/android/messaging/util/DebugUtils.java

@@ -31,6 +31,8 @@ import android.telephony.SmsMessage;
 import android.text.TextUtils;
 import android.widget.ArrayAdapter;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 import com.android.messaging.R;
 import com.android.messaging.datamodel.SyncManager;
@@ -101,6 +103,7 @@ public class DebugUtils {
             mTitle = title;
         }
 
+        @NonNull
         @Override
         public String toString() {
             return mTitle;

src/com/android/messaging/util/EmailAddress.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +17,8 @@
 
 package com.android.messaging.util;
 
+import androidx.annotation.NonNull;
+
 import com.google.common.base.CharMatcher;
 
 /**
@@ -104,6 +107,7 @@ public final class EmailAddress {
         return isValidInternal();
     }
 
+    @NonNull
     @Override
     public String toString() {
         return user + "@" + host;

src/com/android/messaging/util/NotificationPlayer.java

@@ -26,6 +26,8 @@ import android.os.Looper;
 import android.os.PowerManager;
 import android.os.SystemClock;
 
+import androidx.annotation.NonNull;
+
 import com.android.messaging.Factory;
 
 import java.util.LinkedList;
@@ -54,6 +56,7 @@ public class NotificationPlayer implements OnCompletionListener {
         long requestTime;
         boolean releaseFocus;
 
+        @NonNull
         @Override
         public String toString() {
             return "{ code=" + code + " looping=" + looping + " stream=" + stream

src/com/android/messaging/util/exif/ExifTag.java

@@ -17,6 +17,8 @@
 
 package com.android.messaging.util.exif;
 
+import androidx.annotation.NonNull;
+
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -999,6 +1001,7 @@ public class ExifTag {
         return false;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return String.format("tag id: %04X\n", mTagId) + "ifd id: " + mIfd + "\ntype: "

src/com/android/messaging/util/exif/Rational.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2024 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +17,8 @@
 
 package com.android.messaging.util.exif;
 
+import androidx.annotation.NonNull;
+
 /**
  * The rational data type of EXIF tag. Contains a pair of longs representing the
  * numerator and denominator of a Rational number.
@@ -81,6 +84,7 @@ public class Rational {
         return false;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return mNumerator + "/" + mDenominator;