diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java index 98a23f2b00750..92b0da1c761f5 100644 --- a/core/java/android/app/ActivityView.java +++ b/core/java/android/app/ActivityView.java @@ -122,7 +122,7 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd } mSurfaceView = new SurfaceView(context, null, 0, 0, disableSurfaceViewBackgroundLayer); // Since ActivityView#getAlpha has been overridden, we should use parent class's alpha - // as master to synchronize surface view's alpha value. + // as authoritative to synchronize surface view's alpha value. mSurfaceView.setAlpha(super.getAlpha()); mSurfaceView.setUseAlpha(); mSurfaceCallback = new SurfaceCallback(); diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index cc4c8aae9132c..2aee696ba36f3 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1887,7 +1887,7 @@ public class AppOpsManager { null, // no permission for writing clipboard null, // no permission for taking media buttons null, // no permission for taking audio focus - null, // no permission for changing master volume + null, // no permission for changing global volume null, // no permission for changing voice volume null, // no permission for changing ring volume null, // no permission for changing media volume @@ -6431,7 +6431,7 @@ public class AppOpsManager { * Retrieve current operation state for all applications. * * The mode of the ops returned are set for the package but may not reflect their effective - * state due to UID policy or because it's controlled by a different master op. + * state due to UID policy or because it's controlled by a different global op. * * Use {@link #unsafeCheckOp(String, int, String)}} or * {@link #noteOp(String, int, String, String, String)} if the effective mode is needed. @@ -6455,7 +6455,7 @@ public class AppOpsManager { * Retrieve current operation state for all applications. * * The mode of the ops returned are set for the package but may not reflect their effective - * state due to UID policy or because it's controlled by a different master op. + * state due to UID policy or because it's controlled by a different global op. * * Use {@link #unsafeCheckOp(String, int, String)}} or * {@link #noteOp(String, int, String, String, String)} if the effective mode is needed. @@ -6477,7 +6477,7 @@ public class AppOpsManager { * Retrieve current operation state for one application. * * The mode of the ops returned are set for the package but may not reflect their effective - * state due to UID policy or because it's controlled by a different master op. + * state due to UID policy or because it's controlled by a different global op. * * Use {@link #unsafeCheckOp(String, int, String)}} or * {@link #noteOp(String, int, String, String, String)} if the effective mode is needed. @@ -6510,7 +6510,7 @@ public class AppOpsManager { * package must match. * * The mode of the ops returned are set for the package but may not reflect their effective - * state due to UID policy or because it's controlled by a different master op. + * state due to UID policy or because it's controlled by a different global op. * * Use {@link #unsafeCheckOp(String, int, String)}} or * {@link #noteOp(String, int, String, String, String)} if the effective mode is needed. diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 70358d5a21c00..1fce990e01c04 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -9067,7 +9067,7 @@ public class DevicePolicyManager { } /** - * Called by device owners to set the user's master location setting. + * Called by device owners to set the user's global location setting. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with * @param locationEnabled whether location should be enabled or disabled @@ -9166,11 +9166,11 @@ public class DevicePolicyManager { } /** - * Called by profile or device owners to set the master volume mute on or off. + * Called by profile or device owners to set the global volume mute on or off. * This has no effect when set on a managed profile. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @param on {@code true} to mute master volume, {@code false} to turn mute off. + * @param on {@code true} to mute global volume, {@code false} to turn mute off. * @throws SecurityException if {@code admin} is not a device or profile owner. */ public void setMasterVolumeMuted(@NonNull ComponentName admin, boolean on) { @@ -9185,10 +9185,10 @@ public class DevicePolicyManager { } /** - * Called by profile or device owners to check whether the master volume mute is on or off. + * Called by profile or device owners to check whether the global volume mute is on or off. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @return {@code true} if master volume is muted, {@code false} if it's not. + * @return {@code true} if global volume is muted, {@code false} if it's not. * @throws SecurityException if {@code admin} is not a device or profile owner. */ public boolean isMasterVolumeMuted(@NonNull ComponentName admin) { diff --git a/core/java/android/bluetooth/BluetoothGattCallback.java b/core/java/android/bluetooth/BluetoothGattCallback.java index cf82a3304572a..f718c0b57c1b8 100644 --- a/core/java/android/bluetooth/BluetoothGattCallback.java +++ b/core/java/android/bluetooth/BluetoothGattCallback.java @@ -183,7 +183,7 @@ public abstract class BluetoothGattCallback { * @param gatt GATT client involved * @param interval Connection interval used on this connection, 1.25ms unit. Valid range is from * 6 (7.5ms) to 3200 (4000ms). - * @param latency Slave latency for the connection in number of connection events. Valid range + * @param latency Worker latency for the connection in number of connection events. Valid range * is from 0 to 499 * @param timeout Supervision timeout for this connection, in 10ms unit. Valid range is from 10 * (0.1s) to 3200 (32s) diff --git a/core/java/android/bluetooth/BluetoothGattServerCallback.java b/core/java/android/bluetooth/BluetoothGattServerCallback.java index 2c8114be3fe33..0ead5f57e86cf 100644 --- a/core/java/android/bluetooth/BluetoothGattServerCallback.java +++ b/core/java/android/bluetooth/BluetoothGattServerCallback.java @@ -187,7 +187,7 @@ public abstract class BluetoothGattServerCallback { * @param device The remote device involved * @param interval Connection interval used on this connection, 1.25ms unit. Valid range is from * 6 (7.5ms) to 3200 (4000ms). - * @param latency Slave latency for the connection in number of connection events. Valid range + * @param latency Worker latency for the connection in number of connection events. Valid range * is from 0 to 499 * @param timeout Supervision timeout for this connection, in 10ms unit. Valid range is from 10 * (0.1s) to 3200 (32s) diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 31d07a05243b3..e1e6eaaad74b4 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -3384,12 +3384,12 @@ public abstract class ContentResolver implements ContentInterface { } /** - * Gets the master auto-sync setting that applies to all the providers and accounts. + * Gets the global auto-sync setting that applies to all the providers and accounts. * If this is false then the per-provider auto-sync setting is ignored. *

This method requires the caller to hold the permission * {@link android.Manifest.permission#READ_SYNC_SETTINGS}. * - * @return the master auto-sync setting that applies to all the providers and accounts + * @return the global auto-sync setting that applies to all the providers and accounts */ public static boolean getMasterSyncAutomatically() { try { @@ -3412,12 +3412,12 @@ public abstract class ContentResolver implements ContentInterface { } /** - * Sets the master auto-sync setting that applies to all the providers and accounts. + * Sets the global auto-sync setting that applies to all the providers and accounts. * If this is false then the per-provider auto-sync setting is ignored. *

This method requires the caller to hold the permission * {@link android.Manifest.permission#WRITE_SYNC_SETTINGS}. * - * @param sync the master auto-sync setting that applies to all the providers and accounts + * @param sync the global auto-sync setting that applies to all the providers and accounts */ public static void setMasterSyncAutomatically(boolean sync) { setMasterSyncAutomaticallyAsUser(sync, UserHandle.myUserId()); diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index cd2d71162b011..e5d29862e3ef3 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3975,7 +3975,7 @@ public class Intent implements Parcelable, Cloneable { public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR"; /** - * Broadcast intent sent by the RecoverySystem to inform listeners that a master clear (wipe) + * Broadcast intent sent by the RecoverySystem to inform listeners that a global clear (wipe) * is about to be performed. * @hide */ diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 2465b0e418766..5fd37c8375e61 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -831,7 +831,7 @@ public class UserManager { public static final String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone"; /** - * Specifies if a user is disallowed from adjusting the master volume. If set, the master volume + * Specifies if a user is disallowed from adjusting the global volume. If set, the global volume * will be muted. This can be set by device owners from API 21 and profile owners from API 24. * The default value is false. * @@ -1057,7 +1057,7 @@ public class UserManager { public static final String DISALLOW_CAMERA = "no_camera"; /** - * Specifies if a user is not allowed to unmute the device's master volume. + * Specifies if a user is not allowed to unmute the device's global volume. * * @see DevicePolicyManager#setMasterVolumeMuted(ComponentName, boolean) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) diff --git a/core/java/android/os/incremental/V4Signature.java b/core/java/android/os/incremental/V4Signature.java index d35ce5b2c3f8e..0702c01ecfe05 100644 --- a/core/java/android/os/incremental/V4Signature.java +++ b/core/java/android/os/incremental/V4Signature.java @@ -31,7 +31,7 @@ import java.nio.ByteOrder; /** * V4 signature fields. - * Keep in sync with APKSig master copy. + * Keep in sync with APKSig authoritative copy. * @hide */ public class V4Signature { diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index dd1e4f46a5de8..095882ebe669e 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -305,7 +305,7 @@ public class RuntimeInit { /** * Returns an HTTP user agent of the form - * "Dalvik/1.1.0 (Linux; U; Android Eclair Build/MASTER)". + * "Dalvik/1.1.0 (Linux; U; Android Eclair Build/MAIN)". */ private static String getDefaultUserAgent() { StringBuilder result = new StringBuilder(64); @@ -324,7 +324,7 @@ public class RuntimeInit { result.append(model); } } - String id = Build.ID; // "MASTER" or "M4-rc20" + String id = Build.ID; // "MAIN" or "M4-rc20" if (id.length() > 0) { result.append(" Build/"); result.append(id); diff --git a/core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java b/core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java index b4610bda2cd9b..ce9ab82614d50 100644 --- a/core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java +++ b/core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java @@ -262,14 +262,14 @@ public class AccountSyncSettingsBackupHelper implements BackupHelper { boolean currentMasterSyncEnabled = ContentResolver.getMasterSyncAutomaticallyAsUser( mUserId); if (currentMasterSyncEnabled) { - // Disable master sync to prevent any syncs from running. + // Disable global sync to prevent any syncs from running. ContentResolver.setMasterSyncAutomaticallyAsUser(false, mUserId); } try { restoreFromJsonArray(accountJSONArray, mUserId); } finally { - // Set the master sync preference to the value from the backup set. + // Set the global sync preference to the value from the backup set. ContentResolver.setMasterSyncAutomaticallyAsUser(masterSyncEnabled, mUserId); } Log.i(TAG, "Restore successful."); diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 376a47c19ca27..dadf08f2cc900 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -2058,7 +2058,7 @@ static void UnmountStorageOnInit(JNIEnv* env) { return; } - // Mark rootfs as being a slave so that changes from default + // Mark rootfs as being MS_SLAVE so that changes from default // namespace only flow into our children. if (mount("rootfs", "/", nullptr, (MS_SLAVE | MS_REC), nullptr) == -1) { RuntimeAbort(env, __LINE__, "Failed to mount() rootfs as MS_SLAVE"); diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 8aae043a3919d..fe57ef1495470 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1532,7 +1532,7 @@ com.android.server.wallpaper.WallpaperManagerService - false @@ -2555,7 +2555,7 @@ ;com.android.settings; + stream or global volumes. --> false + Translation should not be longer than example text. --> Requested by %1$s (%2$s) Yes