filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Remove VisibleForTesting

Browse Source 
Since we removed all tests, no need to keep those flags around either

Change-Id: Icaf71832c459cecbcbddc75f552c60e48ae95189
This commit is contained in:
Michael W
2024-12-26 15:54:38 +01:00
parent bbf90339d2
commit 161c3e9fd9
31 changed files with 6 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/datamodel/BugleDatabaseOperations.java
-4
View File
@@ -50,7 +50,6 @@ import com.android.messaging.util.LogUtil;
import com.android.messaging.util.PhoneUtils;
import com.android.messaging.util.UriUtil;
import com.android.messaging.widget.WidgetConversationProvider;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
import java.util.ArrayList;
@@ -245,7 +244,6 @@ public class BugleDatabaseOperations {
* @param senderBlocked Flag whether sender of message is in blocked people list
* @return The existing conversation id or null
*/
@VisibleForTesting
@DoesNotRunOnMainThread
public static String getExistingConversation(final DatabaseWrapper dbWrapper,
final long threadId, final boolean senderBlocked) {
@@ -898,7 +896,6 @@ public class BugleDatabaseOperations {
return ParticipantData.DEFAULT_SELF_SUB_ID;
}
@VisibleForTesting
@DoesNotRunOnMainThread
public static ArrayList<ParticipantData> getParticipantsForConversation(
final DatabaseWrapper dbWrapper, final String conversationId) {
@@ -1505,7 +1502,6 @@ public class BugleDatabaseOperations {
* @return If the participant is available in our cache, or the DB, this returns the
* participant id for the given subid/phone number. Otherwise it returns null.
*/
@VisibleForTesting
private static String getParticipantId(final DatabaseWrapper dbWrapper,
final int subId, final String canonicalRecipient) {
// First check our memory cache for the participant Id
src/com/android/messaging/datamodel/CursorQueryData.java
+1 -6
View File
@@ -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,7 +21,6 @@ import android.database.Cursor;
import android.net.Uri;
import com.android.messaging.util.Assert;
import com.google.common.annotations.VisibleForTesting;
/**
* Holds parameters and data (such as content URI) for performing queries on the content provider.
@@ -67,11 +67,6 @@ public class CursorQueryData {
}
}
@VisibleForTesting
public Uri getUri() {
return mUri;
}
/**
* Representation of an invalid query. {@link #performSynchronousQuery} will return
* a null Cursor.
src/com/android/messaging/datamodel/MediaScratchFileProvider.java
-2
View File
@@ -32,7 +32,6 @@ import android.text.TextUtils;
import com.android.messaging.Factory;
import com.android.messaging.util.Assert;
import com.android.messaging.util.LogUtil;
import com.google.common.annotations.VisibleForTesting;
import java.io.File;
import java.io.IOException;
@@ -46,7 +45,6 @@ public class MediaScratchFileProvider extends FileProvider {
private static final SimpleArrayMap<Uri, String> sUriToDisplayNameMap = new SimpleArrayMap<>();
@VisibleForTesting
public static final String AUTHORITY =
"com.android.messaging.datamodel.MediaScratchFileProvider";
private static final String MEDIA_SCRATCH_SPACE_DIR = "mediascratchspace";
src/com/android/messaging/datamodel/MessagingContentProvider.java
-2
View File
@@ -41,7 +41,6 @@ import com.android.messaging.util.LogUtil;
import com.android.messaging.util.PhoneUtils;
import com.android.messaging.widget.BugleWidgetProvider;
import com.android.messaging.widget.WidgetConversationProvider;
import com.google.common.annotations.VisibleForTesting;
import java.io.FileDescriptor;
import java.io.FileNotFoundException;
@@ -53,7 +52,6 @@ import java.io.PrintWriter;
public class MessagingContentProvider extends ContentProvider {
private static final String TAG = LogUtil.BUGLE_TAG;
@VisibleForTesting
public static final String AUTHORITY =
"com.android.messaging.datamodel.MessagingContentProvider";
private static final String CONTENT_AUTHORITY = "content://" + AUTHORITY + '/';
src/com/android/messaging/datamodel/MmsFileProvider.java
-2
View File
@@ -22,7 +22,6 @@ import android.net.Uri;
import com.android.messaging.Factory;
import com.android.messaging.util.LogUtil;
import com.google.common.annotations.VisibleForTesting;
import java.io.File;
import java.io.IOException;
@@ -33,7 +32,6 @@ import java.io.IOException;
public class MmsFileProvider extends FileProvider {
private static final String TAG = LogUtil.BUGLE_TAG;
@VisibleForTesting
static final String AUTHORITY = "com.android.messaging.datamodel.MmsFileProvider";
private static final String RAW_MMS_DIR = "rawmms";
src/com/android/messaging/datamodel/ParticipantRefresh.java
-3
View File
@@ -40,7 +40,6 @@ import com.android.messaging.util.LogUtil;
import com.android.messaging.util.OsUtil;
import com.android.messaging.util.PhoneUtils;
import com.android.messaging.util.SafeAsyncTask;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import java.util.ArrayList;
@@ -61,7 +60,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
* 2. Partial refresh, this is triggered when a participant is added to a conversation. This
* normally happens during SMS sync.
*/
@VisibleForTesting
public class ParticipantRefresh {
private static final String TAG = LogUtil.BUGLE_DATAMODEL_TAG;
@@ -200,7 +198,6 @@ public class ParticipantRefresh {
* @param refreshMode the refresh mode desired. See {@link #REFRESH_MODE_FULL},
* {@link #REFRESH_MODE_INCREMENTAL}, and {@link #REFRESH_MODE_SELF_ONLY}
*/
@VisibleForTesting
static void refreshParticipants(final int refreshMode) {
Assert.inRange(refreshMode, REFRESH_MODE_FULL, REFRESH_MODE_SELF_ONLY);
if (LogUtil.isLoggable(TAG, LogUtil.VERBOSE)) {
src/com/android/messaging/datamodel/action/ActionMonitor.java
-17
View File
@@ -25,7 +25,6 @@ import com.android.messaging.util.Assert.RunsOnAnyThread;
import com.android.messaging.util.Assert.RunsOnMainThread;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.ThreadUtil;
import com.google.common.annotations.VisibleForTesting;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -126,7 +125,6 @@ public class ActionMonitor {
/**
* Current state of action
*/
@VisibleForTesting
protected int mState;
/**
@@ -238,7 +236,6 @@ public class ActionMonitor {
* @param expectedOldState - expected existing state of action (can be UNKNOWN)
* @param newState - new state which will be set
*/
@VisibleForTesting
protected void updateState(final Action action, final int expectedOldState,
final int newState) {
ActionStateChangedListener listener = null;
@@ -412,7 +409,6 @@ public class ActionMonitor {
/**
* Map of action monitors indexed by actionKey
*/
@VisibleForTesting
static final SimpleArrayMap<String, ActionMonitor> sActionMonitors = new SimpleArrayMap<>();
/**
@@ -443,19 +439,6 @@ public class ActionMonitor {
return monitor;
}
/**
* Remove monitor from map
*/
@VisibleForTesting
static void unregisterActionMonitor(final String actionKey,
final ActionMonitor monitor) {
if (monitor != null) {
synchronized (sActionMonitors) {
sActionMonitors.remove(actionKey);
}
}
}
/**
* Remove monitor from map if the action is complete
*/
src/com/android/messaging/datamodel/action/ActionServiceImpl.java
-10
View File
@@ -32,7 +32,6 @@ import com.android.messaging.Factory;
import com.android.messaging.datamodel.DataModel;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.LoggingTimer;
import com.google.common.annotations.VisibleForTesting;
/**
* ActionService used to perform background processing for data model
@@ -111,25 +110,16 @@ public class ActionServiceImpl extends JobIntentService {
}
// ops
@VisibleForTesting
protected static final int OP_START_ACTION = 200;
@VisibleForTesting
protected static final int OP_RECEIVE_BACKGROUND_RESPONSE = 201;
@VisibleForTesting
protected static final int OP_RECEIVE_BACKGROUND_FAILURE = 202;
// extras
@VisibleForTesting
protected static final String EXTRA_OP_CODE = "op";
@VisibleForTesting
protected static final String EXTRA_ACTION_BUNDLE = "datamodel_action_bundle";
@VisibleForTesting
protected static final String EXTRA_WORKER_EXCEPTION = "worker_exception";
@VisibleForTesting
protected static final String EXTRA_WORKER_RESPONSE = "worker_response";
@VisibleForTesting
protected static final String EXTRA_WORKER_UPDATE = "worker_update";
@VisibleForTesting
protected static final String BUNDLE_ACTION = "bundle_action";
private BackgroundWorker mBackgroundWorker;
src/com/android/messaging/datamodel/action/BackgroundWorkerService.java
-5
View File
@@ -29,7 +29,6 @@ import com.android.messaging.datamodel.DataModel;
import com.android.messaging.util.Assert;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.LoggingTimer;
import com.google.common.annotations.VisibleForTesting;
import java.util.List;
@@ -64,15 +63,11 @@ public class BackgroundWorkerService extends JobIntentService {
}
// ops
@VisibleForTesting
protected static final int OP_PROCESS_REQUEST = 400;
// extras
@VisibleForTesting
protected static final String EXTRA_OP_CODE = "op";
@VisibleForTesting
protected static final String EXTRA_ACTION = "action";
@VisibleForTesting
protected static final String EXTRA_ATTEMPT = "retry_attempt";
/**
src/com/android/messaging/datamodel/action/ReadDraftDataAction.java
-2
View File
@@ -31,7 +31,6 @@ import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.util.Assert;
import com.android.messaging.util.Assert.RunsOnMainThread;
import com.android.messaging.util.LogUtil;
import com.google.common.annotations.VisibleForTesting;
public class ReadDraftDataAction extends Action implements Parcelable {
@@ -71,7 +70,6 @@ public class ReadDraftDataAction extends Action implements Parcelable {
actionParameters.putParcelable(KEY_INCOMING_DRAFT, incomingDraft);
}
@VisibleForTesting
class DraftData {
public final MessageData message;
public final ConversationListItemData conversation;
src/com/android/messaging/datamodel/data/ConversationMessageData.java
-5
View File
@@ -34,7 +34,6 @@ import com.android.messaging.util.BugleGservicesKeys;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.Dates;
import com.android.messaging.util.LogUtil;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Predicate;
import java.util.ArrayList;
@@ -176,7 +175,6 @@ public class ConversationMessageData {
}
}
@VisibleForTesting
static String[] splitUnquotedString(final String inputString) {
if (TextUtils.isEmpty(inputString)) {
return new String[0];
@@ -204,7 +202,6 @@ public class ConversationMessageData {
*
* @return array of constituent strings
*/
@VisibleForTesting
static String[] splitQuotedString(final String inputString) {
if (TextUtils.isEmpty(inputString)) {
return new String[0];
@@ -270,7 +267,6 @@ public class ConversationMessageData {
}
}
@VisibleForTesting
static List<MessagePartData> makeParts(
final String rawIds,
final String rawContentTypes,
@@ -305,7 +301,6 @@ public class ConversationMessageData {
return parts;
}
@VisibleForTesting
static void unpackMessageParts(
final List<MessagePartData> parts,
final String[] ids,
src/com/android/messaging/datamodel/data/ConversationParticipantsData.java
-7
View File
@@ -24,8 +24,6 @@ import androidx.collection.SimpleArrayMap;
import com.android.messaging.util.Assert;
import com.google.common.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -59,11 +57,6 @@ public class ConversationParticipantsData implements Iterable<ParticipantData> {
}
}
@VisibleForTesting
ParticipantData getParticipantById(final String participantId) {
return mConversationParticipantsMap.get(participantId);
}
ArrayList<ParticipantData> getParticipantListExcludingSelf() {
final ArrayList<ParticipantData> retList =
new ArrayList<>(mConversationParticipantsMap.size());
src/com/android/messaging/datamodel/media/MediaResourceManager.java
-2
View File
@@ -22,7 +22,6 @@ import com.android.messaging.Factory;
import com.android.messaging.util.Assert;
import com.android.messaging.util.Assert.RunsOnAnyThread;
import com.android.messaging.util.LogUtil;
import com.google.common.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.List;
@@ -279,7 +278,6 @@ public class MediaResourceManager {
mediaLoadingTask.executeOnExecutor(executor, (Void) null);
}
@VisibleForTesting
@RunsOnAnyThread
<T extends RefCountedMediaResource> void addResourceToMemoryCache(
final MediaRequest<T> mediaRequest, final T mediaResource) {