TIF: Fix a bug of incorrect watch history

When the user keeps watching one channel without tuning to the other
channel, the user can watch many programs. In this case as many watch
history records as the number of programs the user watched should be
inserted in watched_programs table.
But there is a bug now that only one record is logged for all the
programs and this CL fixes the bug and makes the watch history
logging work correctly for this case.
In addition, package information should be added to the content value
because it should be not null in programs table.

BUG: 16177411
Change-Id: I058f9db927b5d684a1af7852630f50ec2d2743b6

Author: Chulwoo Lee

services/core/java/com/android/server/tv/TvInputManagerService.java

@@ -713,6 +713,10 @@ private void removeSessionStateLocked(IBinder sessionToken, int userId) {
         // Remove the session state from the global session state map of the current user.
         SessionState sessionState = userState.sessionStateMap.remove(sessionToken);
 
+        if (sessionState == null) {
+            return;
+        }
+
         // Close the open log entry, if any.
         if (sessionState.mLogUri != null) {
             SomeArgs args = SomeArgs.obtain();
@@ -2150,6 +2154,7 @@ private void onOpenEntry(Uri logUri, long channelId, long watchStarttime,
                     args.arg1 = logUri;
                     args.arg2 = channelId;
                     args.arg3 = endTime;
+                    args.arg4 = sessionState;
                     Message msg = obtainMessage(LogHandler.MSG_UPDATE_ENTRY, args);
                     sendMessageDelayed(msg, endTime - System.currentTimeMillis());
                 }
@@ -2162,49 +2167,64 @@ private void onOpenEntry(Uri logUri, long channelId, long watchStarttime,
 
         private void onUpdateEntry(Uri uri, long channelId, long time, SessionState sessionState) {
             String[] projection = {
-                    TvContract.WatchedPrograms.COLUMN_WATCH_START_TIME_UTC_MILLIS,
-                    TvContract.WatchedPrograms.COLUMN_WATCH_END_TIME_UTC_MILLIS,
-                    TvContract.WatchedPrograms.COLUMN_TITLE,
-                    TvContract.WatchedPrograms.COLUMN_START_TIME_UTC_MILLIS,
-                    TvContract.WatchedPrograms.COLUMN_END_TIME_UTC_MILLIS,
-                    TvContract.WatchedPrograms.COLUMN_DESCRIPTION
+                    TvContract.WatchedPrograms.COLUMN_WATCH_END_TIME_UTC_MILLIS
             };
             Cursor cursor = null;
             try {
                 cursor = mContentResolver.query(uri, projection, null, null, null);
                 if (cursor != null && cursor.moveToNext()) {
-                    long watchStartTime = cursor.getLong(0);
-                    long watchEndTime = cursor.getLong(1);
-                    String title = cursor.getString(2);
-                    long startTime = cursor.getLong(3);
-                    long endTime = cursor.getLong(4);
-                    String description = cursor.getString(5);
-
+                    long watchEndTime = cursor.getLong(0);
                     // Do nothing if the current log entry is already closed.
                     if (watchEndTime > 0) {
                         return;
                     }
 
-                    // The current program has just ended. Create a (complete) log entry off the
-                    // current entry.
+                    // Update the watch end time for the current log entry.
                     ContentValues values = new ContentValues();
-                    values.put(TvContract.WatchedPrograms.COLUMN_WATCH_START_TIME_UTC_MILLIS,
-                            watchStartTime);
                     values.put(TvContract.WatchedPrograms.COLUMN_WATCH_END_TIME_UTC_MILLIS, time);
+                    int c = mContentResolver.update(uri, values, null, null);
+                } else {
+                    // The record has been deleted.
+                    synchronized (mLock) {
+                        if (!uri.equals(sessionState.mLogUri)) {
+                            // If the deleted record is not for the current channel, do not re-open
+                            // a log entry for the next program.
+                            return;
+                        }
+                    }
+                }
+                if (cursor != null) {
+                    cursor.close();
+                    cursor = null;
+                }
+
+                // The current program has just ended. Create a new log entry for the next program.
+                uri = ContentUris.withAppendedId(TvContract.Channels.CONTENT_URI, channelId);
+                projection = new String[] {
+                        TvContract.Channels.COLUMN_PACKAGE_NAME
+                };
+                cursor = mContentResolver.query(uri, projection, null, null, null);
+                if (cursor != null && cursor.moveToNext()) {
+                    ContentValues values = new ContentValues();
+                    values.put(TvContract.WatchedPrograms.COLUMN_PACKAGE_NAME, cursor.getString(0));
+                    values.put(TvContract.WatchedPrograms.COLUMN_WATCH_START_TIME_UTC_MILLIS, time);
+                    values.put(TvContract.WatchedPrograms.COLUMN_WATCH_END_TIME_UTC_MILLIS, 0);
                     values.put(TvContract.WatchedPrograms.COLUMN_CHANNEL_ID, channelId);
-                    values.put(TvContract.WatchedPrograms.COLUMN_TITLE, title);
-                    values.put(TvContract.WatchedPrograms.COLUMN_START_TIME_UTC_MILLIS, startTime);
-                    values.put(TvContract.WatchedPrograms.COLUMN_END_TIME_UTC_MILLIS, endTime);
-                    values.put(TvContract.WatchedPrograms.COLUMN_DESCRIPTION, description);
-                    mContentResolver.insert(TvContract.WatchedPrograms.CONTENT_URI, values);
+                    Uri newUri = mContentResolver.insert(TvContract.WatchedPrograms.CONTENT_URI,
+                            values);
+
+                    synchronized (mLock) {
+                        sessionState.mLogUri = newUri;
+                    }
+
+                    // Re-open the current log entry with the next program information.
+                    onOpenEntry(newUri, channelId, time, sessionState);
                 }
             } finally {
                 if (cursor != null) {
                     cursor.close();
                 }
             }
-            // Re-open the current log entry with the next program information.
-            onOpenEntry(uri, channelId, time, sessionState);
         }
 
         private void onCloseEntry(Uri uri, long watchEndTime) {