Projects >> android_packages_apps_Bluetooth >>f29687ed0e0ff7c90bd43f89190ca0568f6135ae

Chunk
Conflicting content 
 */
package com.android.bluetooth.map;

<<<<<<< HEAD
import android.annotation.TargetApi;
=======
import java.io.Closeable;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import javax.obex.ResponseCodes;

import org.xmlpull.v1.XmlSerializer;

import android.Manifest;
>>>>>>> 2c7ffe6b2dd6dbc9fb53c548401da46a9068bef1
import android.app.Activity;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
Solution content 
 */
package com.android.bluetooth.map;

import android.annotation.TargetApi;
import android.app.Activity;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
File
BluetoothMapContentObserver.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
<<<<<<< HEAD
=======
import android.os.Build;
>>>>>>> 2c7ffe6b2dd6dbc9fb53c548401da46a9068bef1
import android.os.Binder;
import android.os.Handler;
import android.os.Looper;
Solution content 
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
import android.os.Binder;
import android.os.Handler;
import android.os.Looper;
File
BluetoothMapContentObserver.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    }

    static public void actionMessageSentDisconnected(Context context, Intent intent, int result) {
<<<<<<< HEAD
        TYPE type = TYPE.fromOrdinal(
        intent.getIntExtra(EXTRA_MESSAGE_SENT_MSG_TYPE, TYPE.NONE.ordinal()));
        if(type == TYPE.MMS) {
            actionMmsSent(context, intent, result, null);
        } else {
            actionSmsSentDisconnected(context, intent, result);
        }
    }

    static public void actionSmsSentDisconnected(Context context, Intent intent, int result) {
        /* Check permission for message deletion. */
        if ((Binder.getCallingPid() != Process.myPid()) ||
            (context.checkCallingOrSelfPermission("android.Manifest.permission.WRITE_SMS")
                    != PackageManager.PERMISSION_GRANTED)) {
            Log.w(TAG, "actionSmsSentDisconnected: Not allowed to delete SMS/MMS messages");
=======
        /* Check permission for message deletion. */
        if (context.checkCallingOrSelfPermission(android.Manifest.permission.WRITE_SMS)
              != PackageManager.PERMISSION_GRANTED) {
            Log.w(TAG, "actionMessageSentDisconnected: Not allowed to delete SMS/MMS messages");
>>>>>>> 2c7ffe6b2dd6dbc9fb53c548401da46a9068bef1
            return;
        }
Solution content 
    }

    static public void actionMessageSentDisconnected(Context context, Intent intent, int result) {
        TYPE type = TYPE.fromOrdinal(
        intent.getIntExtra(EXTRA_MESSAGE_SENT_MSG_TYPE, TYPE.NONE.ordinal()));
        if(type == TYPE.MMS) {
            actionMmsSent(context, intent, result, null);
        } else {
            actionSmsSentDisconnected(context, intent, result);
        }
    }

    static public void actionSmsSentDisconnected(Context context, Intent intent, int result) {
        /* Check permission for message deletion. */
        if ((Binder.getCallingPid() != Process.myPid()) ||
            (context.checkCallingOrSelfPermission("android.Manifest.permission.WRITE_SMS")
                    != PackageManager.PERMISSION_GRANTED)) {
            Log.w(TAG, "actionSmsSentDisconnected: Not allowed to delete SMS/MMS messages");
            return;
        }
File
BluetoothMapContentObserver.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Method signature
Variable