commit 21bc58521f9dd4c4c78fd2b828fba4076fdce8c1
author The Android Automerger <android-build@android.com> Sat Jun 16 07:03:33 2012 -0700
committer The Android Automerger <android-build@android.com> Sat Jun 16 07:03:33 2012 -0700
tree 2c9b427e37f168cfe08b9e116795327c2f601b77
parent 5cb59523d7d7e25c58bd99c100c50e49c78481ce
parent b1d709560fca799ff0e5ed4a94b4e674f3caa812

merge in jb-release history after reset to jb-dev

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

diff --git a/src/com/android/bluetooth/opp/BluetoothOppNotification.java b/src/com/android/bluetooth/opp/BluetoothOppNotification.java
index a5b913d..7589850 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppNotification.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppNotification.java
@@ -115,7 +115,7 @@
 
         int totalTotal = 0; // total bytes for current transfer
 
-        int timeStamp = 0; // Database time stamp. Used for sorting ongoing transfers.
+        long timeStamp = 0; // Database time stamp. Used for sorting ongoing transfers.
 
         String description; // the text above progress bar
 
@@ -238,7 +238,7 @@
 
         mNotifications.clear();
         for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
-            int timeStamp = cursor.getInt(timestampIndex);
+            long timeStamp = cursor.getLong(timestampIndex);
             int dir = cursor.getInt(directionIndex);
             int id = cursor.getInt(idIndex);
             int total = cursor.getInt(totalBytesIndex);