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

Commit 5ce9f591 authored by Pradeep Panigrahi's avatar Pradeep Panigrahi Committed by Linux Build Service Account
Browse files

Clear incoming file notification while BT turned OFF. 

Use Case:
1.From a remote, send a file to DUT
2.The incoming file request is present in notifications menu
3.Now turn off the BT on the receiver side

Failure:
Incoming file request is still present even after turning off BT.

Fix:
This change will ensure that incoming file notification will be cleared
from notification bar while BT is turned OFF. Otherwise, incoming file
notification will be displayed on notification bar even though BT is OFF.

CRs-fixed: 610549

Change-Id: I02f63eb486c5fe9c2529d786baee2634bf213fc9
parent efd6fd5b

src/com/android/bluetooth/opp/BluetoothOppNotification.java

+43 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ import android.app.NotificationManager; 
import android.app.PendingIntent;

import android.content.Intent;

import android.database.Cursor;

import android.database.CursorWindowAllocationException;

import android.database.sqlite.SQLiteException;

import android.net.Uri;

import android.util.Log;

import android.os.Handler;
@@ -154,6 +156,15 @@ class BluetoothOppNotification { 
        }

    }



    public void updateNotifier() {

        if (V) Log.v(TAG, "updateNotifier while BT is Turning OFF");

        synchronized (BluetoothOppNotification.this) {

            updateActiveNotification();

            updateCompletedNotification();

            cancelIncomingFileConfirmNotification();

        }

    }



    private static final int NOTIFY = 0;

    // Use 1 second timer to limit notification frequency.

    // 1. On the first notification, create the update thread.
@@ -529,4 +540,36 @@ class BluetoothOppNotification { 
        }

        cursor.close();

    }



    private void cancelIncomingFileConfirmNotification() {

        Cursor cursor = null;

        try {

            cursor = mContext.getContentResolver().query(BluetoothShare.CONTENT_URI, null,

                WHERE_CONFIRM_PENDING, null, BluetoothShare._ID);

        } catch (SQLiteException e) {

            if (cursor != null) {

                cursor.close();

            }

            cursor = null;

            Log.e(TAG, "cancelupdateIncomingFileConfirmNotification: " + e);

        } catch (CursorWindowAllocationException e) {

            cursor = null;

            Log.e(TAG, "cancelupdateIncomingFileConfirmNotification: " + e);

        }





        if (cursor == null) {

            return;

        }



        for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {

            int id = cursor.getInt(cursor.getColumnIndexOrThrow(BluetoothShare._ID));

            if (V) Log.v(TAG, "Cancelling incoming notification " + id);

            mNotificationMgr.cancel(id);

        }

        cursor.close();

        if (V) Log.v(TAG, "Freeing cursor: " + cursor);

        cursor = null;

    }



}

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

100755 → 100644
+2 −0
Original line number Diff line number Diff line
@@ -383,6 +383,8 @@ public class BluetoothOppService extends Service { 
                        break;

                    case BluetoothAdapter.STATE_TURNING_OFF:

                        if (V) Log.v(TAG, "Receiver DISABLED_ACTION ");

                        mNotifier.updateNotifier();



                        //FIX: Don't block main thread

                        /*

                        mSocketListener.stop();