summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-23 18:09:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-23 18:09:18 +0000
commit684c1e6670fb58250a247ea0db105b6f66486d0f (patch)
tree7623b3c301cd00e241150f47660eaa5866a78858
parent7a0d6ba5755301ff8edf3f5648b84793a3fda7d9 (diff)
parent17c87a9176a8fa2805193b05f9a64bf93cfc0bff (diff)
Merge "Update language to comply with Android's inclusive language guidance" into main am: eb1ddf0204 am: 17c87a9176
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2719960 Change-Id: I481cf6cb6d70b72ffcabd7685d6a777921f8d73f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--telephony/common/com/android/internal/telephony/SmsApplication.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java
index a9cdf7e5bc08..94d4d2260d5c 100644
--- a/telephony/common/com/android/internal/telephony/SmsApplication.java
+++ b/telephony/common/com/android/internal/telephony/SmsApplication.java
@@ -791,7 +791,7 @@ public final class SmsApplication {
AppOpsManager.MODE_ALLOWED);
}
} catch (NameNotFoundException e) {
- // No whitelisted system app on this device
+ // No allowlisted system app on this device
Log.e(LOG_TAG, "Package not found: " + packageName);
}