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

Commit fdfb7cd6 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge "Call getAllowedUid on a separate thread" into oc-dev 

am: 21c34e2b

Change-Id: I7df45a4b0124b68e049bd0b80f7ab6cef2cda4d1
parents b8392e61 21c34e2b

services/core/java/com/android/server/PersistentDataBlockService.java

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ public class PersistentDataBlockService extends SystemService { 
        mContext = context;

        mDataBlockFile = SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP);

        mBlockDeviceSize = -1; // Load lazily

        mAllowedUid = getAllowedUid(UserHandle.USER_SYSTEM);

    }



    private int getAllowedUid(int userHandle) {
@@ -117,6 +116,7 @@ public class PersistentDataBlockService extends SystemService { 
    public void onStart() {

        // Do init on a separate thread, will join in PHASE_ACTIVITY_MANAGER_READY

        SystemServerInitThreadPool.get().submit(() -> {

            mAllowedUid = getAllowedUid(UserHandle.USER_SYSTEM);

            enforceChecksumValidity();

            formatIfOemUnlockEnabled();

            publishBinderService(Context.PERSISTENT_DATA_BLOCK_SERVICE, mService);