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

Commit 54685a6e authored by Nick Pelly's avatar Nick Pelly
Browse files

Update application code for BluetoothAdapter.getDefaultAdapter(). 

Change-Id: I7baafb909b74783da4e51d48f2465e7aacf07eb5
DrNo: eastham
Bug: 2158765
Joke: What goes 99-thump, 99-thump? A centipede with a wooden leg.
parent 0e8d5eef

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

+1 −2
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ public class BluetoothOppBatch { 
     * @param info, BluetoothOppShareInfo

     */

    public BluetoothOppBatch(Context context, BluetoothOppShareInfo info) {

        BluetoothAdapter adapter =

                (BluetoothAdapter) context.getSystemService(Context.BLUETOOTH_SERVICE);

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        mContext = context;

        mShares = Lists.newArrayList();

        mTimestamp = info.mTimestamp;

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class BluetoothOppManager { 
        // This will be around as long as this process is

        mContext = context.getApplicationContext();



        mAdapter = (BluetoothAdapter) context.getSystemService(Context.BLUETOOTH_SERVICE);

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        if (mAdapter == null) {

            if (V) Log.v(TAG, "BLUETOOTH_SERVICE is not started! ");

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public class BluetoothOppService extends Service { 
    public void onCreate() {

        super.onCreate();

        if (V) Log.v(TAG, "Service onCreate");

        mAdapter = (BluetoothAdapter) getSystemService(Context.BLUETOOTH_SERVICE);

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        mSocketListener = new BluetoothOppRfcommListener(mAdapter);

        mShares = Lists.newArrayList();

        mBatchs = Lists.newArrayList();

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch 
        mSession = session;



        mBatch.registerListern(this);

        mAdapter = (BluetoothAdapter)mContext.getSystemService(Context.BLUETOOTH_SERVICE);

        mAdapter = BluetoothAdapter.getDefaultAdapter();



    }

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

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class BluetoothOppTransferActivity extends AlertActivity implements 
            BluetoothOppUtility.updateVisibilityToHidden(this, mUri);

        }



        mAdapter = (BluetoothAdapter) getSystemService(Context.BLUETOOTH_SERVICE); 

        mAdapter = BluetoothAdapter.getDefaultAdapter();



        // Set up the "dialog"

        setUpDialog();