Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update language to comply with Android's inclusive language guidance

Browse Source 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Id1a0f2a38e41badee3a34bd71af240511f273a7b
This commit is contained in:
Jeff Sharkey
2020-09-11 14:43:28 -06:00
parent 6516a83886
commit 16dd960d6f
14 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityView.java
View File

@@ -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();

10
core/java/android/app/AppOpsManager.java
View File

@@ -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.

10
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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) {

2
core/java/android/bluetooth/BluetoothGattCallback.java
View File

@@ -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)

2
core/java/android/bluetooth/BluetoothGattServerCallback.java
View File

@@ -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)

8
core/java/android/content/ContentResolver.java
View File

@@ -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.
* <p>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.
* <p>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());

2
core/java/android/content/Intent.java
View File

@@ -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
*/

4
core/java/android/os/UserManager.java
View File

@@ -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 <code>false</code>.
*
@@ -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)

2
core/java/android/os/incremental/V4Signature.java
View File

@@ -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 {

4
core/java/com/android/internal/os/RuntimeInit.java
View File

@@ -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);

4
core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java
View File

@@ -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.");

2
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -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");

4
core/res/res/values/config.xml
View File

@@ -1532,7 +1532,7 @@
<!-- Class name of WallpaperManagerService. -->
<string name="config_wallpaperManagerServiceName" translatable="false">com.android.server.wallpaper.WallpaperManagerService</string>
<!-- Enables the TimeZoneRuleManager service. This is the master switch for the updateable time
<!-- Enables the TimeZoneRuleManager service. This is the global switch for the updateable time
zone update mechanism. -->
<bool name="config_enableUpdateableTimeZoneRules">false</bool>
@@ -2555,7 +2555,7 @@
<string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string>
<!-- Flag indicating that the media framework should not allow changes or mute on any
stream or master volumes. -->
stream or global volumes. -->
<bool name="config_useFixedVolume">false</bool>
<!-- The list of IMEs which should be disabled until used.

2
core/res/res/values/strings.xml
View File

@@ -3899,7 +3899,7 @@
<string name="gpsNotifTitle">Location request</string>
<!-- Network positioning notification message. The name of the user (e.g. John Doe) and
service (SUPL-service) who sent the request is shown as dynamic strings.
Translation should not be longer than master text. -->
Translation should not be longer than example text. -->
<string name="gpsNotifMessage">Requested by <xliff:g id="name">%1$s</xliff:g> (<xliff:g id="service" example="SUPL-service">%2$s</xliff:g>)</string>
<!-- Network positioning verification Yes. Button to push to share location information. -->
<string name="gpsVerifYes">Yes</string>