diff options
8 files changed, 12 insertions, 12 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index d15c60b9501d..fa29ce8474f8 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -1338,7 +1338,7 @@ public class AccessibilityWindowManager { mTouchInteractionInProgress = false; // We want to set the active window to be current immediately // after the user has stopped touching the screen since if the - // user types with the IME he should get a feedback for the + // user types with the IME they should get a feedback for the // letter typed in the text view which is in the input focused // window. Note that we always deliver hover accessibility events // (they are a result of user touching the screen) so change of diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java index fbc986bdd730..6074ac94faf3 100644 --- a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java +++ b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java @@ -637,7 +637,7 @@ public class TouchExplorer extends BaseEventStreamTransformation } // If the user is touch exploring the second pointer may be // performing a double tap to activate an item without need - // for the user to lift his exploring finger. + // for the user to lift their exploring finger. // It is *important* to use the distance traveled by the pointers // on the screen which may or may not be magnified. final float deltaX = diff --git a/services/core/java/com/android/server/EntropyMixer.java b/services/core/java/com/android/server/EntropyMixer.java index 5e6e9d34dc25..c56cef2d58dc 100644 --- a/services/core/java/com/android/server/EntropyMixer.java +++ b/services/core/java/com/android/server/EntropyMixer.java @@ -52,9 +52,9 @@ import android.util.Slog; * entropy estimate is not increased. This is to avoid having to trust/verify * the quality and authenticity of the "randomness" of the HW RNG. * - * <p>This class was modeled after the script in - * <a href="http://www.kernel.org/doc/man-pages/online/pages/man4/random.4.html">man - * 4 random</a>. + * <p>This class was modeled after the script in the + * <a href="http://www.kernel.org/doc/man-pages/online/pages/man4/random.4.html"> + * random(4) manual page</a>. */ public class EntropyMixer extends Binder { private static final String TAG = "EntropyMixer"; diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index 36d69c93c1cb..34db0149c73b 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -190,7 +190,7 @@ class AutomaticBrightnessController { // When the short term model is invalidated, we don't necessarily reset it (i.e. clear the // user's adjustment) immediately, but wait for a drastic enough change in the ambient light. - // The anchor determines what were the light levels when the user has set her preference, and + // The anchor determines what were the light levels when the user has set their preference, and // we use a relative threshold to determine when to revert to the OEM curve. private boolean mShortTermModelValid; private float mShortTermModelAnchor; diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 90370ddd21dd..cef5cb6c6e30 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -2590,11 +2590,11 @@ public class LockSettingsService extends ILockSettings.Stub { * make it consistent with current behaviour. It also allows ActivityManager to call * unlockUser() with empty secret. * 3. Once a user is migrated to have synthetic password, its value will never change, no matter - * whether the user changes his lockscreen PIN or clear/reset it. When the user clears its + * whether the user changes their lockscreen PIN or clear/reset it. When the user clears its * lockscreen PIN, we still maintain the existing synthetic password in a password blob * protected by a default PIN. * 4. The user SID is linked with synthetic password, but its cleared/re-created when the user - * clears/re-creates his lockscreen PIN. + * clears/re-creates their lockscreen PIN. * * * Different cases of calling this method: diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 9e91a9f0ab68..b02b90092b7a 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -816,7 +816,7 @@ public class MediaSessionService extends SystemService implements Monitor { * Information about a full user and its corresponding managed profiles. * * <p>Since the full user runs together with its managed profiles, a user wouldn't differentiate - * them when he/she presses a media/volume button. So keeping media sessions for them in one + * them when they press a media/volume button. So keeping media sessions for them in one * place makes more sense and increases the readability.</p> * <p>The contents of this object is guarded by {@link #mLock}. */ diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index cec9417abc27..81748b23e6ee 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3506,7 +3506,7 @@ public class PackageManagerService extends IPackageManager.Stub ver.fingerprint = Build.FINGERPRINT; } - // Grandfather existing (installed before Q) non-system apps to hide + // Legacy existing (installed before Q) non-system apps to hide // their icons in launcher. if (!mOnlyCore && mIsPreQUpgrade) { Slog.i(TAG, "Whitelisting all existing apps to hide their icons"); @@ -16276,7 +16276,7 @@ public class PackageManagerService extends IPackageManager.Stub /** * A container of all data needed to commit a package to in-memory data structures and to disk. - * TODO: move most of the data contained her into a PackageSetting for commit. + * TODO: move most of the data contained here into a PackageSetting for commit. */ private static class ReconciledPackage { public final ReconcileRequest request; diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 8a81c8ee9ca7..3a30f98cc528 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -2038,7 +2038,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } WallpaperData wd = mWallpaperMap.get(user.id); if (wd == null) { - // User hasn't started yet, so load her settings to peek at the wallpaper + // User hasn't started yet, so load their settings to peek at the wallpaper loadSettingsLocked(user.id, false); wd = mWallpaperMap.get(user.id); } |