summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yohei Yukawa <yukawa@google.com> 2023-11-29 17:07:32 +0900
committer Yohei Yukawa <yukawa@google.com> 2023-11-29 17:07:32 +0900
commitbf701d44d02b39b3550cc414b16e54afe72ba48e (patch)
tree6b038f7c62ae856335b74dec39abea3df3646cef
parent23d665cf2fe44c0217b9214fa120aafd7ac283ed (diff)
Inline InputMethodUtils#getStringForUser
With my previous commit [1], we can safely inline InputMethodUtils#getStringForUser(), which is used in only one place. [1]: I1a9a09655bd63fc5d8cd1811f82c04001d21c22d Bug: 309837937 Test: presubmit Change-Id: Ie621bedbe2ce65d14d5d49d612828aea2606084c
-rw-r--r--services/core/java/com/android/server/inputmethod/InputMethodUtils.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java
index 7c42ee83dc15..984ae1f06711 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java
@@ -330,17 +330,11 @@ final class InputMethodUtils {
@Nullable
private String getString(@NonNull String key, @Nullable String defaultValue) {
- return getStringForUser(key, defaultValue, mCurrentUserId);
- }
-
- @Nullable
- private String getStringForUser(
- @NonNull String key, @Nullable String defaultValue, @UserIdInt int userId) {
final String result;
if (mCopyOnWrite && mCopyOnWriteDataStore.containsKey(key)) {
result = mCopyOnWriteDataStore.get(key);
} else {
- result = Settings.Secure.getStringForUser(mResolver, key, userId);
+ result = Settings.Secure.getStringForUser(mResolver, key, mCurrentUserId);
}
return result != null ? result : defaultValue;
}