Projects >> platform_frameworks_base >>21a34de7a87a55b608dd2b694e4522bd9d17e277

Chunk
Conflicting content 
            readPermissions();

<<<<<<< HEAD
            mRestoredSettings = mSettings.readLPw(this, sUserManager.getUsers(false),
=======
            mFoundPolicyFile = SELinuxMMAC.readInstallPolicy();

            mRestoredSettings = mSettings.readLPw(sUserManager.getUsers(false),
>>>>>>> 40a85bbc8449fe36bee287ae030f7f779c4a979f
                    mSdkVersion, mOnlyCore);
            long startTime = SystemClock.uptimeMillis();
Solution content 
            readPermissions();

            mRestoredSettings = mSettings.readLPw(this, sUserManager.getUsers(false),
                    mSdkVersion, mOnlyCore);
            long startTime = SystemClock.uptimeMillis();
File
PackageManagerService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation