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

Commit e3d77a2d authored by Zongheng Wang's avatar Zongheng Wang Committed by android-build-merger
Browse files

Merge "Resolve usage of hidden API in Lists" am: c5725410 am: dd30b012 

am: b7222156

Change-Id: I440a02ccf8f5487dc649adbb8320a1ce73321742
parents 2bc45124 b7222156

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

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

import android.util.Log;



import com.google.android.collect.Lists;



import java.io.File;

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

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        mContext = context;

        mShares = Lists.newArrayList();

        mShares = new ArrayList();

        mTimestamp = info.mTimestamp;

        mDirection = info.mDirection;

        mDestination = adapter.getRemoteDevice(info.mDestination);

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

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

import com.android.internal.annotations.VisibleForTesting;



import com.google.android.collect.Lists;



import java.io.IOException;

import java.text.SimpleDateFormat;

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

            Log.v(TAG, "onCreate");

        }

        mShares = Lists.newArrayList();

        mBatches = Lists.newArrayList();

        mShares = new ArrayList();

        mBatches = new ArrayList();

        mBatchId = 1;

        final ContentResolver contentResolver = getContentResolver();

        new Thread("trimDatabase") {

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

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


import com.android.bluetooth.R;



import com.google.android.collect.Lists;



import java.io.File;

import java.io.IOException;

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.

    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;

        Cursor metadataCursor =

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