Projects >> platform_frameworks_base >>dd3d95f182a634acdcc1b1e8e4954234d048eb54

Chunk
Conflicting content
    static final String mTempContainerPrefix = "smdl2tmp";

<<<<<<< HEAD:services/core/java/com/android/server/pm/PackageManagerService.java
    final ServiceThread mHandlerThread;
=======
    private static final String IDMAP_PREFIX = "/data/resource-cache/";
    private static final String IDMAP_SUFFIX = "@idmap";

    final HandlerThread mHandlerThread = new HandlerThread("PackageManager",
            Process.THREAD_PRIORITY_BACKGROUND);
>>>>>>> 4ad93639d210297764db3ffcd870ff38464943de:services/java/com/android/server/pm/PackageManagerService.java
    final PackageHandler mHandler;

    final int mSdkVersion = Build.VERSION.SDK_INT;
Solution content
    static final String mTempContainerPrefix = "smdl2tmp";

    final ServiceThread mHandlerThread;

    private static final String IDMAP_PREFIX = "/data/resource-cache/";
    private static final String IDMAP_SUFFIX = "@idmap";

    final PackageHandler mHandler;

    final int mSdkVersion = Build.VERSION.SDK_INT;
File
PackageManagerService.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation