Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39d23119 authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "remove hidden APIs in sqlitewrapper"

parents 6fed6dd9 4bd72305

src/java/com/android/internal/telephony/SMSDispatcher.java

+2 −4
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import android.content.pm.PackageItemInfo; 
import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.database.sqlite.SqliteWrapper;

import android.net.Uri;

import android.os.AsyncResult;

import android.os.Binder;
@@ -1592,8 +1591,7 @@ public abstract class SMSDispatcher extends Handler { 
                // If we wrote this message in writeSentMessage, update it now

                ContentValues values = new ContentValues(1);

                values.put(Sms.STATUS, status);

                SqliteWrapper.update(context, context.getContentResolver(),

                        mMessageUri, values, null, null);

                context.getContentResolver().update(mMessageUri, values, null, null);

            }

        }
@@ -1613,7 +1611,7 @@ public abstract class SMSDispatcher extends Handler { 
            values.put(Sms.ERROR_CODE, errorCode);

            final long identity = Binder.clearCallingIdentity();

            try {

                if (SqliteWrapper.update(context, context.getContentResolver(), mMessageUri, values,

                if (context.getContentResolver().update(mMessageUri, values,

                        null/*where*/, null/*selectionArgs*/) != 1) {

                    Rlog.e(TAG, "Failed to move message to " + messageType);

                }

src/java/com/android/internal/telephony/WapPushOverSms.java

+19 −26
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.content.ServiceConnection; 
import android.database.Cursor;

import android.database.DatabaseUtils;

import android.database.sqlite.SQLiteException;

import android.database.sqlite.SqliteWrapper;

import android.net.Uri;

import android.os.Bundle;

import android.os.IBinder;
@@ -478,9 +477,7 @@ public class WapPushOverSms implements ServiceConnection { 
                    // Update thread ID for ReadOrigInd & DeliveryInd.

                    final ContentValues values = new ContentValues(1);

                    values.put(Telephony.Mms.THREAD_ID, threadId);

                    if (SqliteWrapper.update(

                            mContext,

                            mContext.getContentResolver(),

                    if (mContext.getContentResolver().update(

                            uri,

                            values,

                            null/*where*/,
@@ -552,9 +549,7 @@ public class WapPushOverSms implements ServiceConnection { 
        }

        Cursor cursor = null;

        try {

            cursor = SqliteWrapper.query(

                    context,

                    context.getContentResolver(),

            cursor = context.getContentResolver().query(

                Telephony.Mms.CONTENT_URI,

                new String[]{ Telephony.Mms.THREAD_ID },

                THREAD_ID_SELECTION,
@@ -587,9 +582,7 @@ public class WapPushOverSms implements ServiceConnection { 
            String[] selectionArgs = new String[] { location };

            Cursor cursor = null;

            try {

                cursor = SqliteWrapper.query(

                        context,

                        context.getContentResolver(),

                cursor = context.getContentResolver().query(

                    Telephony.Mms.CONTENT_URI,

                    new String[]{ Telephony.Mms._ID },

                    LOCATION_SELECTION,