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

Commit c5725410 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Resolve usage of hidden API in Lists"

parents b9ee0231 f90cbca7

android/app/src/com/android/bluetooth/opp/BluetoothOppBatch.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -37,8 +37,6 @@ import android.bluetooth.BluetoothDevice; 
import android.content.Context;

import android.content.Context;

import android.util.Log;

import android.util.Log;





import com.google.android.collect.Lists;



import java.io.File;

import java.io.File;

import java.util.ArrayList;

import java.util.ArrayList;
@@ -105,7 +103,7 @@ public class BluetoothOppBatch { 
    public BluetoothOppBatch(Context context, BluetoothOppShareInfo info) {

    public BluetoothOppBatch(Context context, BluetoothOppShareInfo info) {

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        mContext = context;

        mContext = context;

        mShares = Lists.newArrayList();

        mShares = new ArrayList();

        mTimestamp = info.mTimestamp;

        mTimestamp = info.mTimestamp;

        mDirection = info.mDirection;

        mDirection = info.mDirection;

        mDestination = adapter.getRemoteDevice(info.mDestination);

        mDestination = adapter.getRemoteDevice(info.mDestination);

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -61,8 +61,6 @@ import com.android.bluetooth.btservice.ProfileService; 
import com.android.bluetooth.sdp.SdpManager;

import com.android.bluetooth.sdp.SdpManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;





import com.google.android.collect.Lists;



import java.io.IOException;

import java.io.IOException;

import java.text.SimpleDateFormat;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.ArrayList;
@@ -196,8 +194,8 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 
        if (V) {

        if (V) {

            Log.v(TAG, "onCreate");

            Log.v(TAG, "onCreate");

        }

        }

        mShares = Lists.newArrayList();

        mShares = new ArrayList();

        mBatches = Lists.newArrayList();

        mBatches = new ArrayList();

        mBatchId = 1;

        mBatchId = 1;

        final ContentResolver contentResolver = getContentResolver();

        final ContentResolver contentResolver = getContentResolver();

        new Thread("trimDatabase") {

        new Thread("trimDatabase") {

android/app/src/com/android/bluetooth/opp/BluetoothOppUtility.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -50,8 +50,6 @@ import android.util.Log; 




import com.android.bluetooth.R;

import com.android.bluetooth.R;





import com.google.android.collect.Lists;



import java.io.File;

import java.io.File;

import java.io.IOException;

import java.io.IOException;

import java.math.RoundingMode;

import java.math.RoundingMode;
@@ -147,7 +145,7 @@ public class BluetoothOppUtility { 
     */

     */

    // This function is used when UI show batch transfer. Currently only show single transfer.

    // This function is used when UI show batch transfer. Currently only show single transfer.

    public static ArrayList<String> queryTransfersInBatch(Context context, Long timeStamp) {

    public static ArrayList<String> queryTransfersInBatch(Context context, Long timeStamp) {

        ArrayList<String> uris = Lists.newArrayList();

        ArrayList<String> uris = new ArrayList();

        final String where = BluetoothShare.TIMESTAMP + " == " + timeStamp;

        final String where = BluetoothShare.TIMESTAMP + " == " + timeStamp;

        Cursor metadataCursor =

        Cursor metadataCursor =

                context.getContentResolver().query(BluetoothShare.CONTENT_URI, new String[]{

                context.getContentResolver().query(BluetoothShare.CONTENT_URI, new String[]{