Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc65b50c authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[ToA] Fix suggestions in previous change." into main

parents 468b2ac4 e38172fd

services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionManagerInternal.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

}

services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java

+2 −3
Original line number Diff line number Diff line
@@ -359,8 +359,7 @@ public class GrammaticalInflectionService extends SystemService { 
                    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) {

services/core/java/com/android/server/wm/WindowProcessController.java

+1 −2
Original line number Diff line number Diff line
@@ -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,