Projects >> platform_packages_providers_mediaprovider >>67ee3ac32d1293a1f7a5fa4aa2eee217dab7a78e

Chunk
Conflicting content 
                // If doing this here turns out to be a performance bottleneck,
                // consider moving this to native code and using triggers on
                // the view.
<<<<<<< HEAD
                values = new ContentValues(initialValues);
=======
                ContentValues values = new ContentValues(initialValues);

                // TODO Remove this and actually store the album_artist in the
                // database. For now this is here so the media scanner can start
                // sending us the album_artist, even though it's not in the db yet.
                String albumartist = values.getAsString(MediaStore.Audio.Media.ALBUM_ARTIST);
                values.remove(MediaStore.Audio.Media.ALBUM_ARTIST);
                String compilation = values.getAsString(MediaStore.Audio.Media.COMPILATION);
                values.remove(MediaStore.Audio.Media.COMPILATION);
>>>>>>> 3c01a83fa9f122e0b12dd2f320123c8b714107b5

                // Insert the artist into the artist table and remove it from
                // the input values
Solution content 
                // If doing this here turns out to be a performance bottleneck,
                // consider moving this to native code and using triggers on
                // the view.
                values = new ContentValues(initialValues);

                String albumartist = values.getAsString(MediaStore.Audio.Media.ALBUM_ARTIST);
                String compilation = values.getAsString(MediaStore.Audio.Media.COMPILATION);
                values.remove(MediaStore.Audio.Media.COMPILATION);

                // Insert the artist into the artist table and remove it from
                // the input values
File
MediaProvider.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
                case AUDIO_MEDIA_ID:
                    {
                        ContentValues values = new ContentValues(initialValues);
<<<<<<< HEAD
=======
                        // TODO Remove this and actually store the album_artist in the
                        // database. For now this is here so the media scanner can start
                        // sending us the album_artist, even though it's not in the db yet.
                        String albumartist = values.getAsString(MediaStore.Audio.Media.ALBUM_ARTIST);
                        values.remove(MediaStore.Audio.Media.ALBUM_ARTIST);
                        String compilation = values.getAsString(MediaStore.Audio.Media.COMPILATION);
                        values.remove(MediaStore.Audio.Media.COMPILATION);
>>>>>>> 3c01a83fa9f122e0b12dd2f320123c8b714107b5

                        // Insert the artist into the artist table and remove it from
                        // the input values
Solution content 
                case AUDIO_MEDIA_ID:
                    {
                        ContentValues values = new ContentValues(initialValues);
                        String albumartist = values.getAsString(MediaStore.Audio.Media.ALBUM_ARTIST);
                        String compilation = values.getAsString(MediaStore.Audio.Media.COMPILATION);
                        values.remove(MediaStore.Audio.Media.COMPILATION);

                        // Insert the artist into the artist table and remove it from
                        // the input values
File
MediaProvider.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
    private static final int DATABASE_VERSION = 93;

    private static String TAG = "MediaProvider";
    private static final boolean LOCAL_LOGV = false;
<<<<<<< HEAD
    private static final int DATABASE_VERSION = 302;
=======
>>>>>>> 3c01a83fa9f122e0b12dd2f320123c8b714107b5
    private static final String INTERNAL_DATABASE_NAME = "internal.db";

    // maximum number of cached external databases to keep
Solution content 
    private static String TAG = "MediaProvider";
    private static final boolean LOCAL_LOGV = false;
    private static final int DATABASE_VERSION = 303;
    private static final String INTERNAL_DATABASE_NAME = "internal.db";

    // maximum number of cached external databases to keep
File
MediaProvider.java
Developer's decision
Manual
Kind of conflict
Attribute