Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 21c34e2b50

Change-Id: I7df45a4b0124b68e049bd0b80f7ab6cef2cda4d1
This commit is contained in:
Fyodor Kupolov
2017-04-27 04:00:09 +00:00
committed by android-build-merger
parent b8392e6105 21c34e2b50
commit fdfb7cd6ff
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/PersistentDataBlockService.java
View File

@@ -95,7 +95,6 @@ public class PersistentDataBlockService extends SystemService {
mContext = context; mContext = context;
mDataBlockFile = SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP); mDataBlockFile = SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP);
mBlockDeviceSize = -1; // Load lazily mBlockDeviceSize = -1; // Load lazily
mAllowedUid = getAllowedUid(UserHandle.USER_SYSTEM);
} }
private int getAllowedUid(int userHandle) { private int getAllowedUid(int userHandle) {
@@ -117,6 +116,7 @@ public class PersistentDataBlockService extends SystemService {
public void onStart() { public void onStart() {
// Do init on a separate thread, will join in PHASE_ACTIVITY_MANAGER_READY // Do init on a separate thread, will join in PHASE_ACTIVITY_MANAGER_READY
SystemServerInitThreadPool.get().submit(() -> { SystemServerInitThreadPool.get().submit(() -> {
mAllowedUid = getAllowedUid(UserHandle.USER_SYSTEM);
enforceChecksumValidity(); enforceChecksumValidity();
formatIfOemUnlockEnabled(); formatIfOemUnlockEnabled();
publishBinderService(Context.PERSISTENT_DATA_BLOCK_SERVICE, mService); publishBinderService(Context.PERSISTENT_DATA_BLOCK_SERVICE, mService);