Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16dd960d authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Update language to comply with Android's inclusive language guidance 

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

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Id1a0f2a38e41badee3a34bd71af240511f273a7b
parent 6516a838

core/java/android/app/ActivityView.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

core/java/android/app/AppOpsManager.java

+5 −5
Original line number Diff line number Diff line
@@ -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.

core/java/android/app/admin/DevicePolicyManager.java

+5 −5
Original line number Diff line number Diff line
@@ -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) {

































core/java/android/bluetooth/BluetoothGattCallback.java



+1
−1




























Original line number
Diff line number
Diff line








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

































core/java/android/bluetooth/BluetoothGattServerCallback.java



+1
−1




























Original line number
Diff line number
Diff line








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