diff options
41 files changed, 57 insertions, 57 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 812ca4aefb9b..7afe8b79f021 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4053,7 +4053,7 @@ public final class ActivityThread extends ClientTransactionHandler { private void handleCreateBackupAgent(CreateBackupAgentData data) { if (DEBUG_BACKUP) Slog.v(TAG, "handleCreateBackupAgent: " + data); - // Sanity check the requested target package's uid against ours + // Validity check the requested target package's uid against ours try { PackageInfo requestedPackage = getPackageManager().getPackageInfo( data.appInfo.packageName, 0, UserHandle.myUserId()); diff --git a/core/java/android/app/AppOps.md b/core/java/android/app/AppOps.md index ad1a30146663..ac8acbfa98f4 100644 --- a/core/java/android/app/AppOps.md +++ b/core/java/android/app/AppOps.md @@ -53,7 +53,7 @@ To control access the app-op can be set to: : Allow the access but only if the app is currently in the [foreground](#foreground) `MODE_IGNORED` -: Don't allow the access, i.e. don't perform the requested action or return dummy data +: Don't allow the access, i.e. don't perform the requested action or return placeholder data `MODE_ERRORED` : Throw a `SecurityException` on access. This can be suppressed by using a `...noThrow` method to diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 0a6827cde3d3..cc4c8aae9132 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -115,8 +115,8 @@ import java.util.function.Supplier; * <dt>{@link #MODE_ALLOWED} * <dd>Allow the access * <dt>{@link #MODE_IGNORED} - * <dd>Don't allow the access, i.e. don't perform the requested action or return no or dummy - * data + * <dd>Don't allow the access, i.e. don't perform the requested action or return no or + * placeholder data * <dt>{@link #MODE_ERRORED} * <dd>Throw a {@link SecurityException} on access. This can be suppressed by using a * {@code ...noThrow} method to check the mode @@ -135,7 +135,7 @@ import java.util.function.Supplier; * <p>Each platform defined runtime permission (beside background modifiers) has an associated app * op which is used for tracking but also to allow for silent failures. I.e. if the runtime * permission is denied the caller gets a {@link SecurityException}, but if the permission is - * granted and the app-op is {@link #MODE_IGNORED} then the callers gets dummy behavior, e.g. + * granted and the app-op is {@link #MODE_IGNORED} then the callers gets placeholder behavior, e.g. * location callbacks would not happen. * * <h3>App-op permissions</h3> diff --git a/core/java/android/app/SearchableInfo.java b/core/java/android/app/SearchableInfo.java index 83eb2ee1da14..5388282a1b46 100644 --- a/core/java/android/app/SearchableInfo.java +++ b/core/java/android/app/SearchableInfo.java @@ -418,7 +418,7 @@ public final class SearchableInfo implements Parcelable { com.android.internal.R.styleable.SearchableActionKey_suggestActionMsgColumn); a.recycle(); - // sanity check. + // validity check. if (mKeyCode == 0) { throw new IllegalArgumentException("No keycode."); } else if ((mQueryActionMsg == null) && diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java index e4818b274342..7624f356eb6a 100644 --- a/core/java/android/app/WallpaperColors.java +++ b/core/java/android/app/WallpaperColors.java @@ -74,7 +74,7 @@ public final class WallpaperColors implements Parcelable { */ public static final int HINT_FROM_BITMAP = 1 << 2; - // Maximum size that a bitmap can have to keep our calculations sane + // Maximum size that a bitmap can have to keep our calculations valid private static final int MAX_BITMAP_SIZE = 112; // Even though we have a maximum size, we'll mainly match bitmap sizes diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index ededd0d2ea30..cd2d71162b01 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2861,7 +2861,7 @@ public class Intent implements Parcelable, Cloneable { * This should <em>only</em> be used to determine when the wallpaper * has changed to show the new wallpaper to the user. You should certainly * never, in response to this, change the wallpaper or other attributes of - * it such as the suggested size. That would be crazy, right? You'd cause + * it such as the suggested size. That would be unexpected, right? You'd cause * all kinds of loops, especially if other apps are doing similar things, * right? Of course. So please don't do this. * diff --git a/core/java/android/content/pm/AndroidTestBaseUpdater.java b/core/java/android/content/pm/AndroidTestBaseUpdater.java index 1cbbdca76e13..b6bee42e99c8 100644 --- a/core/java/android/content/pm/AndroidTestBaseUpdater.java +++ b/core/java/android/content/pm/AndroidTestBaseUpdater.java @@ -17,7 +17,7 @@ package android.content.pm; /** - * Dummy class to maintain legacy behavior of including a class in core source to toggle + * Placeholder class to maintain legacy behavior of including a class in core source to toggle * whether or not a shared library is stripped at build time. * * @hide diff --git a/core/java/android/content/res/ApkAssets.java b/core/java/android/content/res/ApkAssets.java index bc418061e1d1..0536c2bdafc1 100644 --- a/core/java/android/content/res/ApkAssets.java +++ b/core/java/android/content/res/ApkAssets.java @@ -368,7 +368,7 @@ public final class ApkAssets { try (XmlBlock block = new XmlBlock(null, nativeXmlPtr)) { XmlResourceParser parser = block.newParser(); // If nativeOpenXml doesn't throw, it will always return a valid native pointer, - // which makes newParser always return non-null. But let's be paranoid. + // which makes newParser always return non-null. But let's be careful. if (parser == null) { throw new AssertionError("block.newParser() returned a null parser"); } diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 15a184f0e5ef..ca5aa36861b4 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -1058,7 +1058,7 @@ public final class AssetManager implements AutoCloseable { XmlResourceParser parser = block.newParser(); // If openXmlBlockAsset doesn't throw, it will always return an XmlBlock object with // a valid native pointer, which makes newParser always return non-null. But let's - // be paranoid. + // be careful. if (parser == null) { throw new AssertionError("block.newParser() returned a null parser"); } diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index c5a11abe1136..1c5df4825192 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -452,20 +452,20 @@ public class InputMethodService extends AbstractInputMethodService { /** * An opaque {@link Binder} token of window requesting {@link InputMethodImpl#showSoftInput} * The original app window token is passed from client app window. - * {@link com.android.server.inputmethod.InputMethodManagerService} creates a unique dummy - * token to identify this window. - * This dummy token is only valid for a single call to {@link InputMethodImpl#showSoftInput}, - * after which it is set null until next call. + * {@link com.android.server.inputmethod.InputMethodManagerService} creates a unique + * placeholder token to identify this window. + * This placeholder token is only valid for a single call to + * {@link InputMethodImpl#showSoftInput}, after which it is set null until next call. */ private IBinder mCurShowInputToken; /** * An opaque {@link Binder} token of window requesting {@link InputMethodImpl#hideSoftInput} * The original app window token is passed from client app window. - * {@link com.android.server.inputmethod.InputMethodManagerService} creates a unique dummy - * token to identify this window. - * This dummy token is only valid for a single call to {@link InputMethodImpl#hideSoftInput}, - * after which it is set {@code null} until next call. + * {@link com.android.server.inputmethod.InputMethodManagerService} creates a unique + * placeholder token to identify this window. + * This placeholder token is only valid for a single call to + * {@link InputMethodImpl#hideSoftInput}, after which it is set {@code null} until next call. */ private IBinder mCurHideInputToken; diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java index 81deba463fc0..1d28489d2ac8 100644 --- a/core/java/android/os/BaseBundle.java +++ b/core/java/android/os/BaseBundle.java @@ -1613,7 +1613,7 @@ public class BaseBundle { return; } int lengthPos = parcel.dataPosition(); - parcel.writeInt(-1); // dummy, will hold length + parcel.writeInt(-1); // placeholder, will hold length parcel.writeInt(BUNDLE_MAGIC); int startPos = parcel.dataPosition(); diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index 257bc5b64285..6c5b04a649e2 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -2500,7 +2500,7 @@ public final class StrictMode { * that happens while this span is active. You must call finish() on the span when done. * * <p>This will never return null, but on devices without debugging enabled, this may return a - * dummy object on which the finish() method is a no-op. + * placeholder object on which the finish() method is a no-op. * * <p>TODO: add CloseGuard to this, verifying callers call finish. * diff --git a/core/java/android/os/UpdateEngine.java b/core/java/android/os/UpdateEngine.java index e907e2204b7b..5a48242f26ea 100644 --- a/core/java/android/os/UpdateEngine.java +++ b/core/java/android/os/UpdateEngine.java @@ -109,7 +109,7 @@ public class UpdateEngine { * Error code: an update failed to apply due to a mismatch in payload * hash. * - * <p>Update engine does sanity checks for the given payload and its + * <p>Update engine does validity checks for the given payload and its * metadata. */ public static final int PAYLOAD_HASH_MISMATCH_ERROR = 10; diff --git a/core/java/android/os/WorkSource.java b/core/java/android/os/WorkSource.java index 6adba63f42ce..a1b4dc3ffded 100644 --- a/core/java/android/os/WorkSource.java +++ b/core/java/android/os/WorkSource.java @@ -1133,7 +1133,7 @@ public class WorkSource implements Parcelable { ArrayList<WorkChain> newChains = null; ArrayList<WorkChain> goneChains = null; - // TODO(narayan): This is a dumb O(M*N) algorithm that determines what has changed across + // TODO(narayan): This is a naive O(M*N) algorithm that determines what has changed across // WorkSource objects. We can replace this with something smarter, for e.g by defining // a Comparator between WorkChains. It's unclear whether that will be more efficient if // the number of chains associated with a WorkSource is expected to be small diff --git a/core/java/android/os/incremental/IncrementalFileStorages.java b/core/java/android/os/incremental/IncrementalFileStorages.java index 31ccf95ba16f..dcbbd712914a 100644 --- a/core/java/android/os/incremental/IncrementalFileStorages.java +++ b/core/java/android/os/incremental/IncrementalFileStorages.java @@ -69,7 +69,7 @@ public final class IncrementalFileStorages { @Nullable StorageHealthCheckParams healthCheckParams, @Nullable IStorageHealthListener healthListener, List<InstallationFileParcel> addedFiles) throws IOException { - // TODO(b/136132412): sanity check if session should not be incremental + // TODO(b/136132412): validity check if session should not be incremental IncrementalManager incrementalManager = (IncrementalManager) context.getSystemService( Context.INCREMENTAL_SERVICE); if (incrementalManager == null) { diff --git a/core/java/android/provider/DocumentsProvider.java b/core/java/android/provider/DocumentsProvider.java index 327bca268a7b..1a59e8d34547 100644 --- a/core/java/android/provider/DocumentsProvider.java +++ b/core/java/android/provider/DocumentsProvider.java @@ -165,7 +165,7 @@ public abstract class DocumentsProvider extends ContentProvider { public void attachInfo(Context context, ProviderInfo info) { registerAuthority(info.authority); - // Sanity check our setup + // Validity check our setup if (!info.exported) { throw new SecurityException("Provider must be exported"); } diff --git a/core/java/android/provider/SearchIndexablesProvider.java b/core/java/android/provider/SearchIndexablesProvider.java index f4d0cb4d43d3..85c0ba1c4b1f 100644 --- a/core/java/android/provider/SearchIndexablesProvider.java +++ b/core/java/android/provider/SearchIndexablesProvider.java @@ -100,7 +100,7 @@ public abstract class SearchIndexablesProvider extends ContentProvider { mMatcher.addURI(mAuthority, SearchIndexablesContract.DYNAMIC_INDEXABLES_RAW_PATH, MATCH_DYNAMIC_RAW_CODE); - // Sanity check our setup + // Validity check our setup if (!info.exported) { throw new SecurityException("Provider must be exported"); } diff --git a/core/java/android/util/LongSparseArray.java b/core/java/android/util/LongSparseArray.java index 55542d898784..eefb15604bbc 100644 --- a/core/java/android/util/LongSparseArray.java +++ b/core/java/android/util/LongSparseArray.java @@ -495,7 +495,7 @@ public class LongSparseArray<E> implements Cloneable { array.mKeys = source.createLongArray(); array.mValues = source.createStringArray(); - // Make sure array is sane + // Make sure array is valid Preconditions.checkArgument(array.mKeys.length >= size); Preconditions.checkArgument(array.mValues.length >= size); diff --git a/core/java/android/util/LongSparseLongArray.java b/core/java/android/util/LongSparseLongArray.java index c05dd9de2f17..f23ec91f0b79 100644 --- a/core/java/android/util/LongSparseLongArray.java +++ b/core/java/android/util/LongSparseLongArray.java @@ -316,7 +316,7 @@ public class LongSparseLongArray implements Cloneable { array.mKeys = source.createLongArray(); array.mValues = source.createLongArray(); - // Make sure array is sane + // Make sure array is valid Preconditions.checkArgument(array.mKeys.length >= size); Preconditions.checkArgument(array.mValues.length >= size); diff --git a/core/java/android/view/inputmethod/InputMethod.java b/core/java/android/view/inputmethod/InputMethod.java index 869a9295e16b..f44ab3ac2ed1 100644 --- a/core/java/android/view/inputmethod/InputMethod.java +++ b/core/java/android/view/inputmethod/InputMethod.java @@ -382,7 +382,7 @@ public interface InputMethod { /** * Update token of the client window requesting {@link #showSoftInput(int, ResultReceiver)} - * @param showInputToken dummy app window token for window requesting + * @param showInputToken placeholder app window token for window requesting * {@link InputMethodManager#showSoftInput(View, int)} * @hide */ @@ -390,7 +390,7 @@ public interface InputMethod { /** * Update token of the client window requesting {@link #hideSoftInput(int, ResultReceiver)} - * @param hideInputToken dummy app window token for window requesting + * @param hideInputToken placeholder app window token for window requesting * {@link InputMethodManager#hideSoftInputFromWindow(IBinder, int)} * @hide */ diff --git a/core/java/android/widget/ExpandableListView.java b/core/java/android/widget/ExpandableListView.java index bdfb5503946d..51869d4e04d5 100644 --- a/core/java/android/widget/ExpandableListView.java +++ b/core/java/android/widget/ExpandableListView.java @@ -1007,7 +1007,7 @@ public class ExpandableListView extends ListView { flatChildPos = mConnector.getFlattenedPos(elChildPos); - // Sanity check + // Validity check if (flatChildPos == null) { throw new IllegalStateException("Could not find child"); } diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java index a3c29a8d4a7b..491ddba8959d 100644 --- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java +++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java @@ -70,7 +70,7 @@ import java.util.Map; public class AccessibilityShortcutController { private static final String TAG = "AccessibilityShortcutController"; - // Dummy component names for framework features + // Placeholder component names for framework features public static final ComponentName COLOR_INVERSION_COMPONENT_NAME = new ComponentName("com.android.server.accessibility", "ColorInversion"); public static final ComponentName DALTONIZER_COMPONENT_NAME = @@ -109,8 +109,8 @@ public class AccessibilityShortcutController { public FrameworkObjectProvider mFrameworkObjectProvider = new FrameworkObjectProvider(); /** - * @return An immutable map from dummy component names to feature info for toggling a framework - * feature + * @return An immutable map from placeholder component names to feature + * info for toggling a framework feature */ public static Map<ComponentName, ToggleableFrameworkFeatureInfo> getFrameworkShortcutFeaturesMap() { diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 14cf258f18ab..4b661ca3ab80 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -3084,7 +3084,7 @@ public class ChooserActivity extends ResolverActivity implements final TargetInfo ti = mChooserMultiProfilePagerAdapter.getActiveListAdapter() .targetInfoForPosition(mListPosition, /* filtered */ true); - // This should always be the case for ItemViewHolder, check for sanity + // This should always be the case for ItemViewHolder, check for validity if (ti instanceof DisplayResolveInfo) { showTargetDetails((DisplayResolveInfo) ti); } @@ -3458,7 +3458,7 @@ public class ChooserActivity extends ResolverActivity implements v.setOnLongClickListener(v1 -> { final TargetInfo ti = mChooserListAdapter.targetInfoForPosition( holder.getItemIndex(column), true); - // This should always be the case for non-DS targets, check for sanity + // This should always be the case for non-DS targets, check for validity if (ti instanceof DisplayResolveInfo) { showTargetDetails((DisplayResolveInfo) ti); } diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java index b3904f457708..e2342bb654a1 100644 --- a/core/java/com/android/internal/app/ToolbarActionBar.java +++ b/core/java/com/android/internal/app/ToolbarActionBar.java @@ -527,7 +527,7 @@ public class ToolbarActionBar extends ActionBar { public View onCreatePanelView(int featureId) { if (featureId == Window.FEATURE_OPTIONS_PANEL) { // This gets called by PhoneWindow.preparePanel. Since this already manages - // its own panel, we return a dummy view here to prevent PhoneWindow from + // its own panel, we return a placeholder view here to prevent PhoneWindow from // preparing a default one. return new View(mDecorToolbar.getContext()); } diff --git a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java index e5475f8bea9d..9b1299ebe54c 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java +++ b/core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java @@ -371,7 +371,7 @@ public final class InputMethodPrivilegedOperations { /** * Calls {@link IInputMethodPrivilegedOperations#applyImeVisibility(IBinder, boolean)}. * - * @param showOrHideInputToken dummy token that maps to window requesting + * @param showOrHideInputToken placeholder token that maps to window requesting * {@link android.view.inputmethod.InputMethodManager#showSoftInput(View, int)} or * {@link android.view.inputmethod.InputMethodManager#hideSoftInputFromWindow * (IBinder, int)} diff --git a/core/java/com/android/internal/os/ZygoteServer.java b/core/java/com/android/internal/os/ZygoteServer.java index 8c81984064d0..0dd8b599a122 100644 --- a/core/java/com/android/internal/os/ZygoteServer.java +++ b/core/java/com/android/internal/os/ZygoteServer.java @@ -297,7 +297,7 @@ class ZygoteServer { mUsapPoolRefillDelayMs = Integer.parseInt(usapPoolRefillDelayMsPropString); } - // Sanity check + // Validity check if (mUsapPoolSizeMin >= mUsapPoolSizeMax) { Log.w(TAG, "The max size of the USAP pool must be greater than the minimum size." + " Restoring default values."); diff --git a/core/java/com/android/internal/view/menu/MenuPopup.java b/core/java/com/android/internal/view/menu/MenuPopup.java index 10bd66f17870..fb871a428e1e 100644 --- a/core/java/com/android/internal/view/menu/MenuPopup.java +++ b/core/java/com/android/internal/view/menu/MenuPopup.java @@ -136,7 +136,7 @@ public abstract class MenuPopup implements ShowableListMenu, MenuPresenter, */ protected static int measureIndividualMenuWidth(ListAdapter adapter, ViewGroup parent, Context context, int maxAllowedWidth) { - // Menus don't tend to be long, so this is more sane than it looks. + // Menus don't tend to be long, so this is more valid than it looks. int maxWidth = 0; View itemView = null; int itemType = 0; diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java index baf3188fb235..eef33684e883 100644 --- a/core/java/com/android/internal/widget/ActionBarContainer.java +++ b/core/java/com/android/internal/widget/ActionBarContainer.java @@ -361,7 +361,7 @@ public class ActionBarContainer extends FrameLayout { } /** - * Dummy drawable so that we don't break background display lists and + * Placeholder drawable so that we don't break background display lists and * projection surfaces. */ private class ActionBarBackgroundDrawable extends Drawable { diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index a1540e52d84b..376a47c19ca2 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -827,7 +827,7 @@ static void MountEmulatedStorage(uid_t uid, jint mount_mode, } if (mount_mode == MOUNT_EXTERNAL_NONE && !force_mount_namespace) { - // Sane default of no storage visible + // Valid default of no storage visible return; } diff --git a/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java b/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java index 6328101b7349..0c351d149d8b 100644 --- a/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java +++ b/core/tests/coretests/src/android/app/activity/ActivityManagerTest.java @@ -269,7 +269,7 @@ public class ActivityManagerTest extends AndroidTestCase { return unmarshalled; } - // If any entries in appear in the list, sanity check them against all running applications + // If any entries in appear in the list, validity check them against all running applications private void checkErrorListSanity(List<ActivityManager.ProcessErrorStateInfo> errList) { if (errList == null) return; @@ -277,7 +277,7 @@ public class ActivityManagerTest extends AndroidTestCase { while (iter.hasNext()) { ActivityManager.ProcessErrorStateInfo info = iter.next(); assertNotNull(info); - // sanity checks + // validity checks assertTrue((info.condition == ActivityManager.ProcessErrorStateInfo.CRASHED) || (info.condition == ActivityManager.ProcessErrorStateInfo.NOT_RESPONDING)); // TODO look at each of these and consider a stronger test diff --git a/core/tests/coretests/src/android/app/assist/AssistStructureTest.java b/core/tests/coretests/src/android/app/assist/AssistStructureTest.java index 1f4e5dffc84e..da386a6bac90 100644 --- a/core/tests/coretests/src/android/app/assist/AssistStructureTest.java +++ b/core/tests/coretests/src/android/app/assist/AssistStructureTest.java @@ -277,7 +277,7 @@ public class AssistStructureTest { try { // Write to parcel - parcel.setDataPosition(0); // Sanity / paranoid check + parcel.setDataPosition(0); // Validity Check structure.writeToParcel(parcel, NO_FLAGS); // Read from parcel diff --git a/core/tests/coretests/src/android/content/FakeProviderLocal.java b/core/tests/coretests/src/android/content/FakeProviderLocal.java index a8c2f4059d50..29f054bd482d 100644 --- a/core/tests/coretests/src/android/content/FakeProviderLocal.java +++ b/core/tests/coretests/src/android/content/FakeProviderLocal.java @@ -20,7 +20,7 @@ import android.database.Cursor; import android.net.Uri; /** - * A dummy content provider for tests. This provider runs in the same process as the test. + * A placeholder content provider for tests. This provider runs in the same process as the test. */ public class FakeProviderLocal extends ContentProvider { diff --git a/core/tests/coretests/src/android/content/FakeProviderRemote.java b/core/tests/coretests/src/android/content/FakeProviderRemote.java index 8bc56607f555..2c92da34d9a4 100644 --- a/core/tests/coretests/src/android/content/FakeProviderRemote.java +++ b/core/tests/coretests/src/android/content/FakeProviderRemote.java @@ -20,7 +20,7 @@ import android.database.Cursor; import android.net.Uri; /** - * A dummy content provider for tests. This provider runs in a different process from the test. + * A placeholder content provider for tests. This provider runs in a different process from the test. */ public class FakeProviderRemote extends ContentProvider { diff --git a/core/tests/coretests/src/android/content/SlowProvider.java b/core/tests/coretests/src/android/content/SlowProvider.java index aba32e836e80..2ba0effa130e 100644 --- a/core/tests/coretests/src/android/content/SlowProvider.java +++ b/core/tests/coretests/src/android/content/SlowProvider.java @@ -20,8 +20,8 @@ import android.database.Cursor; import android.net.Uri; /** - * A dummy content provider for tests. This provider runs in a different process from the test and - * is intentionally slow. + * A placeholder content provider for tests. This provider runs in a + * different process from the test and is intentionally slow. */ public class SlowProvider extends ContentProvider { diff --git a/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java b/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java index ea6917682965..7af96c3f9c6b 100644 --- a/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java +++ b/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java @@ -486,7 +486,7 @@ public class AtomicFormulaTest { assertThat(boolFormula.isInstallerFormula()).isFalse(); } - /** Returns a builder with all fields filled with some dummy data. */ + /** Returns a builder with all fields filled with some placeholder data. */ private AppInstallMetadata.Builder getAppInstallMetadataBuilder() { return new AppInstallMetadata.Builder() .setPackageName("abc") diff --git a/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java b/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java index abc5fed181de..ba060fa630c5 100644 --- a/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java +++ b/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java @@ -282,7 +282,7 @@ public class CompoundFormulaTest { assertThat(compoundFormula.isInstallerFormula()).isTrue(); } - /** Returns a builder with all fields filled with some dummy data. */ + /** Returns a builder with all fields filled with some placeholder data. */ private AppInstallMetadata.Builder getAppInstallMetadataBuilder() { return new AppInstallMetadata.Builder() .setPackageName("abc") diff --git a/core/tests/coretests/src/android/content/integrity/InstallerAllowedByManifestFormulaTest.java b/core/tests/coretests/src/android/content/integrity/InstallerAllowedByManifestFormulaTest.java index 693d4cae1f1c..70712e40fd5d 100644 --- a/core/tests/coretests/src/android/content/integrity/InstallerAllowedByManifestFormulaTest.java +++ b/core/tests/coretests/src/android/content/integrity/InstallerAllowedByManifestFormulaTest.java @@ -110,7 +110,7 @@ public class InstallerAllowedByManifestFormulaTest { assertThat(FORMULA.matches(appInstallMetadata)).isTrue(); } - /** Returns a builder with all fields filled with some dummy data. */ + /** Returns a builder with all fields filled with some placeholder data. */ private AppInstallMetadata.Builder getAppInstallMetadataBuilder() { return new AppInstallMetadata.Builder() .setPackageName("abc") diff --git a/core/tests/coretests/src/android/provider/SearchRecentSuggestionsProviderTest.java b/core/tests/coretests/src/android/provider/SearchRecentSuggestionsProviderTest.java index f84355f6755e..ced1f4d28f74 100644 --- a/core/tests/coretests/src/android/provider/SearchRecentSuggestionsProviderTest.java +++ b/core/tests/coretests/src/android/provider/SearchRecentSuggestionsProviderTest.java @@ -316,7 +316,7 @@ public class SearchRecentSuggestionsProviderTest extends ProviderTestCase2<TestP private void checkResultCounts(String queryString, int minRows, int maxRows, String matchDisplay1, String matchDisplay2) { - // get the cursor and apply sanity checks to result + // get the cursor and apply validity checks to result Cursor c = getQueryCursor(queryString); assertNotNull(c); assertTrue("Insufficient rows in filtered cursor", c.getCount() >= minRows); diff --git a/core/tests/coretests/src/android/view/autofill/AutofillIdTest.java b/core/tests/coretests/src/android/view/autofill/AutofillIdTest.java index b329e55b569f..88f2313cc727 100644 --- a/core/tests/coretests/src/android/view/autofill/AutofillIdTest.java +++ b/core/tests/coretests/src/android/view/autofill/AutofillIdTest.java @@ -318,7 +318,7 @@ public class AutofillIdTest { try { // Write to parcel - parcel.setDataPosition(0); // Sanity / paranoid check + parcel.setDataPosition(0); // Validity Check id.writeToParcel(parcel, 0); // Read from parcel diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureEventTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureEventTest.java index 2008537c040a..67614bb22e4e 100644 --- a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureEventTest.java +++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureEventTest.java @@ -317,7 +317,7 @@ public class ContentCaptureEventTest { try { // Write to parcel - parcel.setDataPosition(0); // Sanity / paranoid check + parcel.setDataPosition(0); // Validity Check event.writeToParcel(parcel, 0); // Read from parcel diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java index 5ea071835de2..eb58c6300fca 100644 --- a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java +++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java @@ -66,7 +66,7 @@ public class ContentCaptureSessionTest { @Test public void testNewAutofillId_differentSessions() { - assertThat(mSession1.getId()).isNotEqualTo(mSession2.getId()); //sanity check + assertThat(mSession1.getId()).isNotEqualTo(mSession2.getId()); //validity check final AutofillId parentId = new AutofillId(42); final AutofillId childId1 = mSession1.newAutofillId(parentId, 108L); final AutofillId childId2 = mSession2.newAutofillId(parentId, 108L); @@ -84,7 +84,7 @@ public class ContentCaptureSessionTest { @Test public void testNewViewStructure() { - assertThat(mMockView.getAutofillId()).isNotNull(); // sanity check + assertThat(mMockView.getAutofillId()).isNotNull(); // validity check final ViewStructure structure = mSession1.newViewStructure(mMockView); assertThat(structure).isNotNull(); assertThat(structure.getAutofillId()).isEqualTo(mMockView.getAutofillId()); |