Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed am: 3772a5b3fd am: c5ef3b9cae am: 03921ada7b am: dc82235933

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136

Change-Id: I99fa531f570a13fd3a27abf522383e631f86ceed

1 files changed, 3 insertions, 3 deletions

diff --git a/telephony/common/android/telephony/LocationAccessPolicy.java b/telephony/common/android/telephony/LocationAccessPolicy.java
index 48794cb37853..502bfa3749eb 100644
--- a/telephony/common/android/telephony/LocationAccessPolicy.java
+++ b/telephony/common/android/telephony/LocationAccessPolicy.java
@@ -47,7 +47,7 @@ public final class LocationAccessPolicy {
         ALLOWED,
         /**
          * Indicates that the denial is due to a transient device state
-         * (e.g. app-ops, location master switch)
+         * (e.g. app-ops, location main switch)
          */
         DENIED_SOFT,
         /**
@@ -316,7 +316,7 @@ public final class LocationAccessPolicy {
             return LocationPermissionResult.ALLOWED;
         }
 
-        // Check the system-wide requirements. If the location master switch is off or
+        // Check the system-wide requirements. If the location main switch is off or
         // the app's profile isn't in foreground, return a soft denial.
         if (!checkSystemLocationAccess(context, query.callingUid, query.callingPid)) {
             return LocationPermissionResult.DENIED_SOFT;
@@ -340,7 +340,7 @@ public final class LocationAccessPolicy {
         }
 
         // At this point, we're out of location checks to do. If the app bypassed all the previous
-        // ones due to the SDK grandfathering schemes, allow it access.
+        // ones due to the SDK backwards compatibility schemes, allow it access.
         return LocationPermissionResult.ALLOWED;
     }