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

Commit e454344e authored by Xin Guan's avatar Xin Guan Committed by Android (Google) Code Review
Browse files

Merge "Use a separate lock for LegacyPermissionSettings"

parents ce2f91b6 d8ba30fe

services/core/java/com/android/server/pm/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
        mHandler = handler;

        mLock = lock;

        mAppIds = new AppIdSettingMap();

        mPermissions = new LegacyPermissionSettings(lock);

        mPermissions = new LegacyPermissionSettings();

        mRuntimePermissionsPersistence = new RuntimePermissionPersistence(

                runtimePermissionsPersistence, new Consumer<Integer>() {

            @Override

services/core/java/com/android/server/pm/permission/LegacyPermissionSettings.java

+2 −6
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ import com.android.modules.utils.TypedXmlPullParser; 
import com.android.modules.utils.TypedXmlSerializer;

import com.android.server.pm.DumpState;

import com.android.server.pm.PackageManagerService;

import com.android.server.pm.PackageManagerTracedLock;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;



import java.io.IOException;

import java.io.PrintWriter;
@@ -59,11 +59,7 @@ public class LegacyPermissionSettings { 
    private final ArrayMap<String, LegacyPermission> mPermissionTrees = new ArrayMap<>();



    @NonNull

    private final Object mLock;



    public LegacyPermissionSettings(@NonNull Object lock) {

        mLock = lock;

    }

    private final PackageManagerTracedLock mLock = new PackageManagerTracedLock();



    @NonNull

    public List<LegacyPermission> getPermissions() {