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

Commit b5ebdc5d authored by Lixin Yue's avatar Lixin Yue Committed by Android Git Automerger
Browse files

am 060d91dd: am 96f7651a: am f2864be1: Fix Opp notifications timestamp not correct issue 

Merge commit '060d91dd'

* commit '060d91dd':
  Fix Opp notifications timestamp not correct issue
parents b50ffca9 060d91dd

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

+3 −3
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ class BluetoothOppNotification { 
            intent.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());

            intent.setData(contentUri);



            n.when = timeStamp;

            n.setLatestEventInfo(mContext, title, caption, PendingIntent.getBroadcast(mContext, 0,

                    intent, 0));
@@ -311,8 +312,6 @@ class BluetoothOppNotification { 
            intent.setData(contentUri);

            n.deleteIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);



            n.when = timeStamp;



            mNotificationMgr.notify(id, n);

        }

        cursor.close();
@@ -342,6 +341,8 @@ class BluetoothOppNotification { 
            Intent intent = new Intent(Constants.ACTION_INCOMING_FILE_CONFIRM);

            intent.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());

            intent.setData(contentUri);



            n.when = timeStamp;

            n.setLatestEventInfo(mContext, title, caption, PendingIntent.getBroadcast(mContext, 0,

                    intent, 0));
@@ -350,7 +351,6 @@ class BluetoothOppNotification { 
            intent.setData(contentUri);

            n.deleteIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);



            n.when = timeStamp;

            mNotificationMgr.notify(id, n);

        }

        cursor.close();