diff options
3 files changed, 6 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionManagerInternal.java b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionManagerInternal.java index 6a6e6ab23687..c2c82edee33d 100644 --- a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionManagerInternal.java +++ b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionManagerInternal.java @@ -16,6 +16,7 @@ package com.android.server.grammaticalinflection; +import android.annotation.NonNull; import android.annotation.Nullable; import android.content.res.Configuration; @@ -55,11 +56,11 @@ public abstract class GrammaticalInflectionManagerInternal { * */ public abstract @Configuration.GrammaticalGender int retrieveSystemGrammaticalGender( - Configuration configuration); + @NonNull Configuration configuration); /** * Whether the package can get the system grammatical gender or not. */ - public abstract boolean canGetSystemGrammaticalGender(int uid, String packageName); + public abstract boolean canGetSystemGrammaticalGender(int uid, @Nullable String packageName); } diff --git a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java index 258e97d2dc71..0bcb26d7d0ab 100644 --- a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java +++ b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java @@ -355,12 +355,11 @@ public class GrammaticalInflectionService extends SystemService { final File file = getGrammaticalGenderFile(userId); synchronized (mLock) { if (!file.exists()) { - Log.d(TAG, "User " + userId + "doesn't have the grammatical gender file."); + Log.d(TAG, "User " + userId + " doesn't have the grammatical gender file."); return; } if (mGrammaticalGenderCache.indexOfKey(userId) < 0) { - try { - InputStream in = new FileInputStream(file); + try (FileInputStream in = new FileInputStream(file)) { final TypedXmlPullParser parser = Xml.resolvePullParser(in); mGrammaticalGenderCache.put(userId, getGrammaticalGenderFromXml(parser)); } catch (IOException | XmlPullParserException e) { diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java index 6acf1f3f84af..ee16a37d6baf 100644 --- a/services/core/java/com/android/server/wm/WindowProcessController.java +++ b/services/core/java/com/android/server/wm/WindowProcessController.java @@ -28,7 +28,6 @@ import static android.view.WindowManager.TRANSIT_FLAG_APP_CRASHED; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_CONFIGURATION; import static com.android.internal.util.Preconditions.checkArgument; import static com.android.server.am.ProcessList.INVALID_ADJ; -import static com.android.server.grammaticalinflection.GrammaticalInflectionUtils.checkSystemGrammaticalGenderPermission; import static com.android.server.wm.ActivityRecord.State.DESTROYED; import static com.android.server.wm.ActivityRecord.State.DESTROYING; import static com.android.server.wm.ActivityRecord.State.PAUSED; @@ -299,7 +298,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio */ private volatile int mActivityStateFlags = ACTIVITY_STATE_FLAG_MASK_MIN_TASK_LAYER; - private boolean mCanUseSystemGrammaticalGender; + private final boolean mCanUseSystemGrammaticalGender; public WindowProcessController(@NonNull ActivityTaskManagerService atm, @NonNull ApplicationInfo info, String name, int uid, int userId, Object owner, |