diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2020-09-11 14:43:28 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2020-09-14 10:00:05 -0600 |
| commit | 16dd960d6f43281cd41f4c35e086eb4eebfa8254 (patch) | |
| tree | 22aaaa39c7b9a7ee83124a0298cced9b258f82c6 /core/java/android/app/AppOpsManager.java | |
| parent | 6516a83886ecee481506d558a3c316cb6e448e57 (diff) | |
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
Diffstat (limited to 'core/java/android/app/AppOpsManager.java')
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index cc4c8aae9132..2aee696ba36f 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. |