diff options
42 files changed, 53 insertions, 53 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java b/services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java index e9c70c60a322..5c15214284f0 100644 --- a/services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java +++ b/services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java @@ -201,7 +201,7 @@ class GestureManifold implements GestureMatcher.StateChangeListener { boolean onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) { if (mState.isClear()) { if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { - // Sanity safeguard: if touch state is clear, then matchers should always be clear + // Validity safeguard: if touch state is clear, then matchers should always be clear // before processing the next down event. clear(); } else { diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java index 9075b78495e4..685bf0f65c1a 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java @@ -198,7 +198,7 @@ final class ContentCapturePerUserService void onConnected() { synchronized (mLock) { if (mZombie) { - // Sanity check - shouldn't happen + // Validity check - shouldn't happen if (mRemoteService == null) { Slog.w(TAG, "Cannot ressurect sessions because remote service is null"); return; diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index ee794badad88..ea14fadff433 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -373,7 +373,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { */ private void notifyInterfaceRemoved(String iface) { // netd already clears out quota and alerts for removed ifaces; update - // our sanity-checking state. + // our validity-checking state. mActiveAlerts.remove(iface); mActiveQuotas.remove(iface); invokeForAllObservers(o -> o.interfaceRemoved(iface)); @@ -1256,7 +1256,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { public void setInterfaceAlert(String iface, long alertBytes) { NetworkStack.checkNetworkStackPermission(mContext); - // quick sanity check + // quick validity check if (!mActiveQuotas.containsKey(iface)) { throw new IllegalStateException("setting alert requires existing quota on iface"); } diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 678387c540ed..c4c406429370 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -1112,7 +1112,7 @@ class StorageManagerService extends IStorageManager.Stub } try { - // TODO(b/135341433): Remove paranoid logging when FUSE is stable + // TODO(b/135341433): Remove cautious logging when FUSE is stable Slog.i(TAG, "Resetting vold..."); mVold.reset(); Slog.i(TAG, "Reset vold"); @@ -2238,7 +2238,7 @@ class StorageManagerService extends IStorageManager.Stub private void mount(VolumeInfo vol) { try { - // TODO(b/135341433): Remove paranoid logging when FUSE is stable + // TODO(b/135341433): Remove cautious logging when FUSE is stable Slog.i(TAG, "Mounting volume " + vol); mVold.mount(vol.id, vol.mountFlags, vol.mountUserId, new IVoldMountCallback.Stub() { @Override diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 27c3ff1b4c09..609416db4908 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -2314,7 +2314,7 @@ public class AccountManagerService List<String> accountRemovedReceivers = getAccountRemovedReceivers(account, accounts); accounts.accountsDb.beginTransaction(); - // Set to a dummy value, this will only be used if the database + // Set to a placeholder value, this will only be used if the database // transaction succeeds. long accountId = -1; try { @@ -6266,7 +6266,7 @@ public class AccountManagerService PRE_N_DATABASE_NAME); if (userId == 0) { // Migrate old file, if it exists, to the new location. - // Make sure the new file doesn't already exist. A dummy file could have been + // Make sure the new file doesn't already exist. A placeholder file could have been // accidentally created in the old location, // causing the new one to become corrupted as well. File oldFile = new File(systemDir, PRE_N_DATABASE_NAME); diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 2d8d2c32a4c3..623b4332e83e 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -422,7 +422,7 @@ class UserController implements Handler.Callback { for (Integer userId : mUserLru) { UserState uss = mStartedUsers.get(userId); if (uss == null) { - // Shouldn't happen, but be sane if it does. + // Shouldn't happen, but recover if it does. continue; } if (uss.state == UserState.STATE_STOPPING diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 7e4038e92563..b59729ca55bb 100755 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -1654,7 +1654,7 @@ public class AudioService extends IAudioService.Stub Settings.Global.getInt( cr, Settings.Global.MODE_RINGER, AudioManager.RINGER_MODE_NORMAL); int ringerMode = ringerModeFromSettings; - // sanity check in case the settings are restored from a device with incompatible + // validity check in case the settings are restored from a device with incompatible // ringer modes if (!isValidRingerMode(ringerMode)) { ringerMode = AudioManager.RINGER_MODE_NORMAL; diff --git a/services/core/java/com/android/server/broadcastradio/hal2/Convert.java b/services/core/java/com/android/server/broadcastradio/hal2/Convert.java index cbfa87f1f7f3..726cdc334943 100644 --- a/services/core/java/com/android/server/broadcastradio/hal2/Convert.java +++ b/services/core/java/com/android/server/broadcastradio/hal2/Convert.java @@ -170,7 +170,7 @@ class Convert { int len = config.ranges.size(); List<RadioManager.BandDescriptor> bands = new ArrayList<>(len); - // Just a dummy value. + // Just a placeholder value. int region = RadioManager.REGION_ITU_1; for (AmFmBandRange range : config.ranges) { diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index c9c86984b95d..2127c729acc4 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -3199,7 +3199,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub boolean res = false; if (mCurMethod != null) { if (DEBUG) Slog.d(TAG, "showCurrentInputLocked: mCurToken=" + mCurToken); - // create a dummy token for IMS so that IMS cannot inject windows into client app. + // create a placeholder token for IMS so that IMS cannot inject windows into client app. Binder showInputToken = new Binder(); mShowRequestWindowMap.put(showInputToken, windowToken); executeOrSendMessage(mCurMethod, mCaller.obtainMessageIIOOO( diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java index a6a607e4ce66..5bd3c5707fd2 100644 --- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java @@ -297,7 +297,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements // if the fix interval is below this we leave GPS on, // if above then we cycle the GPS driver. - // Typical hot TTTF is ~5 seconds, so 10 seconds seems sane. + // Typical hot TTTF is ~5 seconds, so 10 seconds seems valid. private static final int GPS_POLLING_THRESHOLD_INTERVAL = 10 * 1000; // how long to wait if we have a network error in NTP or PSDS downloading diff --git a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java index 3fb713bc01a5..531aef6aeb0f 100644 --- a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java +++ b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java @@ -516,7 +516,7 @@ class GnssNetworkConnectivityHandler { if (mAGpsDataConnectionState == AGPS_DATA_CONNECTION_OPENING) { if (apn == null) { - // assign a dummy value in the case of C2K as otherwise we will have a runtime + // assign a placeholder value in the case of C2K as otherwise we will have a runtime // exception in the following call to native_agps_data_conn_open apn = "dummy-apn"; } diff --git a/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java b/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java index 784f70118e4e..da65fe2bc0ab 100644 --- a/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java +++ b/services/core/java/com/android/server/pm/DynamicCodeLoggingService.java @@ -204,7 +204,7 @@ public class DynamicCodeLoggingService extends JobService { // // A typical message might look like this: // type=1400 audit(0.0:521): avc: granted { execute } for comm="executable" - // path="/data/data/com.dummy.app/executable" dev="sda13" ino=1655302 + // path="/data/data/com.placeholder.app/executable" dev="sda13" ino=1655302 // scontext=u:r:untrusted_app_27:s0:c66,c257,c512,c768 // tcontext=u:object_r:app_data_file:s0:c66,c257,c512,c768 tclass=file // diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index 53f9e7f9a60d..79607351b18a 100644 --- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java +++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java @@ -193,7 +193,7 @@ public class PackageDexOptimizer { String[] classLoaderContexts = DexoptUtils.getClassLoaderContexts( pkg, sharedLibraries, pathsWithCode); - // Sanity check that we do not call dexopt with inconsistent data. + // Validity check that we do not call dexopt with inconsistent data. if (paths.size() != classLoaderContexts.length) { String[] splitCodePaths = pkg.getSplitCodePaths(); throw new IllegalStateException("Inconsistent information " diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index afbb12b2b5b8..cec9417abc27 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -7369,7 +7369,7 @@ public class PackageManagerService extends IPackageManager.Stub Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); } else { // we have an instant application locally, but, we can't admit that since - // callers shouldn't be able to determine prior browsing. create a dummy + // callers shouldn't be able to determine prior browsing. create a placeholder // auxiliary response so the downstream code behaves as if there's an // instant application available externally. when it comes time to start // the instant application, we'll do the right thing. diff --git a/services/core/java/com/android/server/pm/ShortcutRequestPinProcessor.java b/services/core/java/com/android/server/pm/ShortcutRequestPinProcessor.java index d4a02a9ceb2a..eae89f00eb99 100644 --- a/services/core/java/com/android/server/pm/ShortcutRequestPinProcessor.java +++ b/services/core/java/com/android/server/pm/ShortcutRequestPinProcessor.java @@ -497,7 +497,7 @@ class ShortcutRequestPinProcessor { Slog.d(TAG, "Temporarily adding " + shortcutId + " as dynamic"); } // Add as a dynamic shortcut. In order for a shortcut to be dynamic, it must - // have a target activity, so we set a dummy here. It's later removed + // have a target activity, so we set a placeholder here. It's later removed // in deleteDynamicWithId(). if (original.getActivity() == null) { original.setActivity(mService.getDummyMainActivity(appPackageName)); diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 0c42ff6be520..ef48a51028ab 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -3963,7 +3963,7 @@ public class ShortcutService extends IShortcutService.Stub { } /** - * Create a dummy "main activity" component name which is used to create a dynamic shortcut + * Create a placeholder "main activity" component name which is used to create a dynamic shortcut * with no main activity temporarily. */ @NonNull diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 5b1c0fdb8249..e2bd1f1119ca 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -1388,7 +1388,7 @@ public class StagingManager { } /** - * A dummy state for starting the pre reboot verification. + * A placeholder state for starting the pre reboot verification. * * See {@link PreRebootVerificationHandler} to see all nodes of pre reboot verification */ diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java index 8000c639139f..a7f30fde703b 100644 --- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java +++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java @@ -185,7 +185,7 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { return; } - // Sanity checks on the arguments. + // Validity checks on the arguments. Objects.requireNonNull(callback); boolean bootImageProfile = profileType == ArtManager.PROFILE_BOOT_IMAGE; diff --git a/services/core/java/com/android/server/pm/dex/DexoptUtils.java b/services/core/java/com/android/server/pm/dex/DexoptUtils.java index 6807388fa2b2..94238cc73295 100644 --- a/services/core/java/com/android/server/pm/dex/DexoptUtils.java +++ b/services/core/java/com/android/server/pm/dex/DexoptUtils.java @@ -85,7 +85,7 @@ public final class DexoptUtils { // The application has splits. Compute their class loader contexts. - // First, cache the relative paths of the splits and do some sanity checks + // First, cache the relative paths of the splits and do some validity checks String[] splitRelativeCodePaths = getSplitRelativeCodePaths(pkg); // The splits have an implicit dependency on the base apk. @@ -407,7 +407,7 @@ public final class DexoptUtils { for (int i = 0; i < splitRelativeCodePaths.length; i++) { File pathFile = new File(splitCodePaths[i]); splitRelativeCodePaths[i] = pathFile.getName(); - // Sanity check that the base paths of the splits are all the same. + // Validity check that the base paths of the splits are all the same. String basePath = pathFile.getParent(); if (!basePath.equals(baseCodePath)) { Slog.wtf(TAG, "Split paths have different base paths: " + basePath + " and " + diff --git a/services/core/java/com/android/server/power/WirelessChargerDetector.java b/services/core/java/com/android/server/power/WirelessChargerDetector.java index 0d910e47dc0d..f4a014adba42 100644 --- a/services/core/java/com/android/server/power/WirelessChargerDetector.java +++ b/services/core/java/com/android/server/power/WirelessChargerDetector.java @@ -92,7 +92,7 @@ public class WirelessChargerDetector { // cosine of the maximum angle variance that we tolerate while at rest. private static final double MOVEMENT_ANGLE_COS_THRESHOLD = Math.cos(5 * Math.PI / 180); - // Sanity thresholds for the gravity vector. + // Validity thresholds for the gravity vector. private static final double MIN_GRAVITY = SensorManager.GRAVITY_EARTH - 1.0f; private static final double MAX_GRAVITY = SensorManager.GRAVITY_EARTH + 1.0f; diff --git a/services/core/java/com/android/server/search/Searchables.java b/services/core/java/com/android/server/search/Searchables.java index 8af76a17f084..09a1e72ef003 100644 --- a/services/core/java/com/android/server/search/Searchables.java +++ b/services/core/java/com/android/server/search/Searchables.java @@ -417,7 +417,7 @@ public class Searchables { if (activities != null && !activities.isEmpty()) { ActivityInfo ai = activities.get(0).activityInfo; - // TODO: do some sanity checks here? + // TODO: do some validity checks here? return new ComponentName(ai.packageName, ai.name); } Log.w(LOG_TAG, "No web search activity found"); diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index 8979d8c6ba10..aecf1f27da06 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -2344,7 +2344,7 @@ public class StatsPullAtomService extends SystemService { JSONArray app_sizes = json.getJSONArray(DiskStatsFileLogger.APP_SIZES_KEY); JSONArray app_data_sizes = json.getJSONArray(DiskStatsFileLogger.APP_DATA_KEY); JSONArray app_cache_sizes = json.getJSONArray(DiskStatsFileLogger.APP_CACHES_KEY); - // Sanity check: Ensure all 4 lists have the same length. + // Validity check: Ensure all 4 lists have the same length. int length = pkg_names.length(); if (app_sizes.length() != length || app_data_sizes.length() != length || app_cache_sizes.length() != length) { diff --git a/services/core/java/com/android/server/textservices/TextServicesManagerInternal.java b/services/core/java/com/android/server/textservices/TextServicesManagerInternal.java index 56bcdd9ec146..e02cef149c13 100644 --- a/services/core/java/com/android/server/textservices/TextServicesManagerInternal.java +++ b/services/core/java/com/android/server/textservices/TextServicesManagerInternal.java @@ -52,7 +52,7 @@ public abstract class TextServicesManagerInternal { }; /** - * @return Global instance if exists. Otherwise, a dummy no-op instance. + * @return Global instance if exists. Otherwise, a placeholder no-op instance. */ @NonNull public static TextServicesManagerInternal get() { diff --git a/services/core/java/com/android/server/uri/UriGrantsManagerService.java b/services/core/java/com/android/server/uri/UriGrantsManagerService.java index f14c3a53940d..7ea8544fdba1 100644 --- a/services/core/java/com/android/server/uri/UriGrantsManagerService.java +++ b/services/core/java/com/android/server/uri/UriGrantsManagerService.java @@ -685,7 +685,7 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { final int modeFlags = readIntAttribute(in, ATTR_MODE_FLAGS); final long createdTime = readLongAttribute(in, ATTR_CREATED_TIME, now); - // Sanity check that provider still belongs to source package + // Validity check that provider still belongs to source package // Both direct boot aware and unaware packages are fine as we // will do filtering at query time to avoid multiple parsing. final ProviderInfo pi = getProviderInfo(uri.getAuthority(), sourceUserId, diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 06c0c4656332..dfca5a908d40 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -3889,7 +3889,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo mWmService.mWindowPlacerLocked.performSurfacePlacement(); } - // TODO: Super crazy long method that should be broken down... + // TODO: Super unexpected long method that should be broken down... void applySurfaceChangesTransaction() { final WindowSurfacePlacer surfacePlacer = mWmService.mWindowPlacerLocked; diff --git a/services/core/java/com/android/server/wm/TaskPersister.java b/services/core/java/com/android/server/wm/TaskPersister.java index 20af250280f7..a3dc29058f1e 100644 --- a/services/core/java/com/android/server/wm/TaskPersister.java +++ b/services/core/java/com/android/server/wm/TaskPersister.java @@ -197,7 +197,7 @@ public class TaskPersister implements PersisterQueue.Listener { mPersisterQueue.addItem(new TaskWriteQueueItem(task, mService), flush); } } else { - // Dummy. Ensures removeObsoleteFiles is called when LazyTaskThreadWriter is + // Placeholder. Ensures removeObsoleteFiles is called when LazyTaskThreadWriter is // notified. mPersisterQueue.addItem(PersisterQueue.EMPTY_ITEM, flush); } diff --git a/services/core/jni/com_android_server_security_VerityUtils.cpp b/services/core/jni/com_android_server_security_VerityUtils.cpp index 0277f16d5e54..48964ae8a5d9 100644 --- a/services/core/jni/com_android_server_security_VerityUtils.cpp +++ b/services/core/jni/com_android_server_security_VerityUtils.cpp @@ -76,7 +76,7 @@ int statxForFsverity(JNIEnv *env, jobject /* clazz */, jstring filePath) { return -errno; } - // Sanity check. + // Validity check. if ((out.stx_attributes_mask & STATX_ATTR_VERITY) == 0) { ALOGE("Unexpected, STATX_ATTR_VERITY not supported by kernel"); return -ENOSYS; diff --git a/services/people/java/com/android/server/people/data/AbstractProtoDiskReadWriter.java b/services/people/java/com/android/server/people/data/AbstractProtoDiskReadWriter.java index 7672cd0040ec..c03a5a7f4bec 100644 --- a/services/people/java/com/android/server/people/data/AbstractProtoDiskReadWriter.java +++ b/services/people/java/com/android/server/people/data/AbstractProtoDiskReadWriter.java @@ -129,7 +129,7 @@ abstract class AbstractProtoDiskReadWriter<T> { if (files == null || files.length == 0) { return null; } else if (files.length > 1) { - // This can't possibly happen, but sanity check. + // This can't possibly happen, but validity check. Slog.w(TAG, "Found multiple files with the same name: " + Arrays.toString(files)); } return parseFile(files[0]); diff --git a/services/tests/mockingservicestests/src/com/android/server/location/LocationFudgerTest.java b/services/tests/mockingservicestests/src/com/android/server/location/LocationFudgerTest.java index f2246dac01ca..a0f48c674316 100644 --- a/services/tests/mockingservicestests/src/com/android/server/location/LocationFudgerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/location/LocationFudgerTest.java @@ -148,7 +148,7 @@ public class LocationFudgerTest { // accurate the coarsened average will be. we use 70% as a lower bound by -very- roughly // taking the area within a grid where we expect a reasonable percentage of points generated // by step() to fall in another grid square. this likely doesn't have much mathematical - // validity, but it serves as a sanity test as least. + // validity, but it serves as a validity test as least. assertThat(passed / (double) iterations).isGreaterThan(.70); } diff --git a/services/tests/servicestests/apks/install_uses_sdk/res/values/strings.xml b/services/tests/servicestests/apks/install_uses_sdk/res/values/strings.xml index 3b8b3b1af9b5..fcab92b84879 100644 --- a/services/tests/servicestests/apks/install_uses_sdk/res/values/strings.xml +++ b/services/tests/servicestests/apks/install_uses_sdk/res/values/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Just need this dummy file to have something to build. --> +<!-- Just need this placeholder file to have something to build. --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="dummy">dummy</string> </resources> diff --git a/services/tests/servicestests/src/com/android/server/appwidget/AppWidgetServiceImplTest.java b/services/tests/servicestests/src/com/android/server/appwidget/AppWidgetServiceImplTest.java index 8871348d0027..9a5c6337824a 100644 --- a/services/tests/servicestests/src/com/android/server/appwidget/AppWidgetServiceImplTest.java +++ b/services/tests/servicestests/src/com/android/server/appwidget/AppWidgetServiceImplTest.java @@ -176,7 +176,7 @@ public class AppWidgetServiceImplTest extends InstrumentationTestCase { } /** - * Sends dummy widget updates to {@link #mManager}. + * Sends placeholder widget updates to {@link #mManager}. * @param widgetId widget to update * @param viewIds a list of view ids for which * {@link AppWidgetManager#notifyAppWidgetViewDataChanged} will be called diff --git a/services/tests/servicestests/src/com/android/server/appwidget/DummyAppWidget.java b/services/tests/servicestests/src/com/android/server/appwidget/DummyAppWidget.java index 803119f4c5fa..fd99b21c9538 100644 --- a/services/tests/servicestests/src/com/android/server/appwidget/DummyAppWidget.java +++ b/services/tests/servicestests/src/com/android/server/appwidget/DummyAppWidget.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.Intent; /** - * Dummy widget for testing + * Placeholder widget for testing */ public class DummyAppWidget extends BroadcastReceiver { diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java index 30bb38a075be..737eeafb9735 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java @@ -77,7 +77,7 @@ public class AuthServiceTest { public void setUp() { MockitoAnnotations.initMocks(this); - // Dummy test config + // Placeholder test config final String[] config = { "0:2:15", // ID0:Fingerprint:Strong "1:4:15", // ID1:Iris:Strong diff --git a/services/tests/servicestests/src/com/android/server/display/AmbientBrightnessStatsTrackerTest.java b/services/tests/servicestests/src/com/android/server/display/AmbientBrightnessStatsTrackerTest.java index e8e6dedaa258..df672c9f248d 100644 --- a/services/tests/servicestests/src/com/android/server/display/AmbientBrightnessStatsTrackerTest.java +++ b/services/tests/servicestests/src/com/android/server/display/AmbientBrightnessStatsTrackerTest.java @@ -294,7 +294,7 @@ public class AmbientBrightnessStatsTrackerTest { AmbientBrightnessStatsTracker statsTracker = getTestStatsTracker(); ArrayList<AmbientBrightnessDayStats> userStats; float[] expectedStats; - // Generate some dummy data + // Generate some placeholder data // Data: very old which should not be read statsTracker.start(); statsTracker.add(0, 0.05f); diff --git a/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java b/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java index 48dda019f570..ae966aaf2b58 100644 --- a/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java +++ b/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java @@ -466,7 +466,7 @@ public class BrightnessMappingStrategyTest { Resources resources = createResources(GAMMA_CORRECTION_LUX, GAMMA_CORRECTION_NITS, DISPLAY_LEVELS_NITS, DISPLAY_LEVELS_BACKLIGHT); BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources); - // Let's start with a sanity check: + // Let's start with a validity check: assertEquals(y1, strategy.getBrightness(x1), 0.01f /* tolerance */); assertEquals(y2, strategy.getBrightness(x2), 0.01f /* tolerance */); assertEquals(y3, strategy.getBrightness(x3), 0.01f /* tolerance */); @@ -494,7 +494,7 @@ public class BrightnessMappingStrategyTest { Resources resources = createResources(GAMMA_CORRECTION_LUX, GAMMA_CORRECTION_NITS, DISPLAY_LEVELS_NITS, DISPLAY_LEVELS_BACKLIGHT); BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources); - // Sanity check: + // Validity check: assertEquals(y1, strategy.getBrightness(x1), 0.01f /* tolerance */); assertEquals(y2, strategy.getBrightness(x2), 0.01f /* tolerance */); assertEquals(y3, strategy.getBrightness(x3), 0.01f /* tolerance */); @@ -540,7 +540,7 @@ public class BrightnessMappingStrategyTest { Resources resources = createResources(GAMMA_CORRECTION_LUX, GAMMA_CORRECTION_NITS, DISPLAY_LEVELS_NITS, DISPLAY_LEVELS_BACKLIGHT); BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources); - // Sanity, as per tradition: + // Validity, as per tradition: assertEquals(y0, strategy.getBrightness(x0), 0.01f /* tolerance */); assertEquals(y2, strategy.getBrightness(x2), 0.01f /* tolerance */); assertEquals(y4, strategy.getBrightness(x4), 0.01f /* tolerance */); diff --git a/services/tests/servicestests/src/com/android/server/emergency/EmergencyAffordanceServiceTest.java b/services/tests/servicestests/src/com/android/server/emergency/EmergencyAffordanceServiceTest.java index d438a0eb9411..3ecff91d8f96 100644 --- a/services/tests/servicestests/src/com/android/server/emergency/EmergencyAffordanceServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/emergency/EmergencyAffordanceServiceTest.java @@ -448,7 +448,7 @@ public class EmergencyAffordanceServiceTest { List<SubscriptionInfo> subInfos = new ArrayList<>(2); // Test with Multiple SIMs. SIM1 is a non-EA SIM - // Only country iso is valuable, all other info are filled with dummy values + // Only country iso is valuable, all other info are filled with placeholder values SubscriptionInfo subInfo = new SubscriptionInfo(1, "890126042XXXXXXXXXXX", 0, "T-mobile", "T-mobile", 0, 255, "12345", 0, null, "310", "226", NON_EMERGENCY_ISO_CODE, false, null, null); diff --git a/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluationEngineTest.java b/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluationEngineTest.java index 0488745c2434..441cd4b47c94 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluationEngineTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluationEngineTest.java @@ -178,7 +178,7 @@ public class RuleEvaluationEngineTest { .isEqualTo(IntegrityCheckResult.Effect.DENY); } - /** 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/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java b/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java index cae7b57580bb..deaeb46c4074 100644 --- a/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java +++ b/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java @@ -505,7 +505,7 @@ public class JobStoreTest { first.getTransientExtras().toString(), second.getTransientExtras().toString()); // Since people can forget to add tests here for new fields, do one last - // sanity check based on bits-on-wire equality. + // validity check based on bits-on-wire equality. final byte[] firstBytes = marshall(first); final byte[] secondBytes = marshall(second); if (!Arrays.equals(firstBytes, secondBytes)) { diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java index 58b71d4b702a..f8043fa56f03 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java @@ -1396,7 +1396,7 @@ public class NetworkPolicyManagerServiceTest { actualCycleDay = mService.getCycleDayFromCarrierConfig(null, DEFAULT_CYCLE_DAY); assertEquals(DEFAULT_CYCLE_DAY, actualCycleDay); - // Sane, non-default values + // Valid, non-default values assertCycleDayAsExpected(config, 1, true); assertCycleDayAsExpected(config, cal.getMaximum(Calendar.DAY_OF_MONTH), true); assertCycleDayAsExpected(config, cal.getMinimum(Calendar.DAY_OF_MONTH), true); diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java index b0b5386a49bd..21b36590e101 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java @@ -468,7 +468,7 @@ public class PackageParserTest { ParsedInstrumentation b) { assertComponentsEqual(a, b); - // Sanity check for InstrumentationInfo. + // Validity check for InstrumentationInfo. assertEquals(a.getTargetPackage(), b.getTargetPackage()); assertEquals(a.getTargetProcesses(), b.getTargetProcesses()); assertEquals(a.isHandleProfiling(), b.isHandleProfiling()); @@ -483,7 +483,7 @@ public class PackageParserTest { ) { assertComponentsEqual(a, b); - // Sanity check for ServiceInfo. + // Validity check for ServiceInfo. ServiceInfo aInfo = PackageInfoUtils.generateServiceInfo(aPkg, a, 0, new PackageUserState(), 0, mockPkgSetting(aPkg)); ServiceInfo bInfo = PackageInfoUtils.generateServiceInfo(bPkg, b, 0, @@ -510,7 +510,7 @@ public class PackageParserTest { ) { assertComponentsEqual(a, b); - // Sanity check for ActivityInfo. + // Validity check for ActivityInfo. ActivityInfo aInfo = PackageInfoUtils.generateActivityInfo(aPkg, a, 0, new PackageUserState(), 0, mockPkgSetting(aPkg)); ActivityInfo bInfo = PackageInfoUtils.generateActivityInfo(bPkg, b, 0, @@ -523,7 +523,7 @@ public class PackageParserTest { ParsedPermissionGroup b) { assertComponentsEqual(a, b); - // Sanity check for PermissionGroupInfo. + // Validity check for PermissionGroupInfo. assertEquals(a.getName(), b.getName()); assertEquals(a.getDescriptionRes(), b.getDescriptionRes()); } @@ -666,13 +666,13 @@ public class PackageParserTest { } if (List.class.isAssignableFrom(fieldType)) { - // Sanity check for list fields: Assume they're non-null and contain precisely + // Validity check for list fields: Assume they're non-null and contain precisely // one element. List<?> list = (List<?>) f.get(pkg); assertNotNull("List was null: " + f, list); assertEquals(1, list.size()); } else if (fieldType.getComponentType() != null) { - // Sanity check for array fields: Assume they're non-null and contain precisely + // Validity check for array fields: Assume they're non-null and contain precisely // one element. Object array = f.get(pkg); assertNotNull(Array.get(array, 0)); diff --git a/services/tests/servicestests/src/com/android/server/storage/DiskStatsFileLoggerTest.java b/services/tests/servicestests/src/com/android/server/storage/DiskStatsFileLoggerTest.java index 13a3c2f23988..46224cb8f855 100644 --- a/services/tests/servicestests/src/com/android/server/storage/DiskStatsFileLoggerTest.java +++ b/services/tests/servicestests/src/com/android/server/storage/DiskStatsFileLoggerTest.java @@ -123,7 +123,7 @@ public class DiskStatsFileLoggerTest extends AndroidTestCase { JSONArray cacheSizes = output.getJSONArray(DiskStatsFileLogger.APP_CACHES_KEY); assertThat(cacheSizes.length()).isEqualTo(2); - // We need to do this crazy Set over this because the DiskStatsFileLogger provides no + // We need to do this unexpected Set over this because the DiskStatsFileLogger provides no // guarantee of the ordering of the apps in its output. By using a set, we avoid any order // problems. ArraySet<AppSizeGrouping> apps = new ArraySet<>(); diff --git a/services/tests/servicestests/src/com/android/server/textclassifier/IconsContentProviderTest.java b/services/tests/servicestests/src/com/android/server/textclassifier/IconsContentProviderTest.java index a787c321fc66..3b963f6697f9 100644 --- a/services/tests/servicestests/src/com/android/server/textclassifier/IconsContentProviderTest.java +++ b/services/tests/servicestests/src/com/android/server/textclassifier/IconsContentProviderTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; /** - * Sanity test for {@link IconsContentProvider}. + * Validity test for {@link IconsContentProvider}. */ @RunWith(AndroidJUnit4.class) public final class IconsContentProviderTest { |