Snap for 9989322 from 1879ee137ede0d62b88cd16da3d46138ca540dfa to mainline-rkpd-release

Change-Id: I35046c7ba53f650c5d42314f226f1df5b7cd8dc1

1 files changed, 12 insertions, 22 deletions

diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoManager.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoManager.cpp
index 9d98be37..4652511a 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoManager.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoManager.cpp
@@ -21,9 +21,18 @@
 using namespace android;
 VideoManager* VideoManager::manager;
 
-VideoManager::VideoManager() {}
+VideoManager::VideoManager()
+{
+    mRequestHandler.Init("VIDEO_REQUEST_EVENT");
+    mResponseHandler.Init("VIDEO_RESPONSE_EVENT");
+}
 
-VideoManager::~VideoManager() {}
+VideoManager::~VideoManager()
+{
+    mRequestHandler.Deinit();
+    mResponseHandler.Deinit();
+    manager = nullptr;
+}
 
 VideoManager* VideoManager::getInstance()
 {
@@ -245,13 +254,6 @@ void VideoManager::SendInternalEvent(
     }
 }
 
-VideoManager::RequestHandler::RequestHandler() :
-        ImsMediaEventHandler("VIDEO_REQUEST_EVENT")
-{
-}
-
-VideoManager::RequestHandler::~RequestHandler() {}
-
 void VideoManager::RequestHandler::processEvent(
         uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB)
 {
@@ -351,13 +353,6 @@ void VideoManager::RequestHandler::processEvent(
     }
 }
 
-VideoManager::ResponseHandler::ResponseHandler() :
-        ImsMediaEventHandler("VIDEO_RESPONSE_EVENT")
-{
-}
-
-VideoManager::ResponseHandler::~ResponseHandler() {}
-
 void VideoManager::ResponseHandler::processEvent(
         uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB)
 {
@@ -407,12 +402,7 @@ void VideoManager::ResponseHandler::processEvent(
             // TODO : add implementation
             break;
         case kVideoMediaInactivityInd:
-            parcel.writeInt32(event);
-            parcel.writeInt32(static_cast<int>(paramA));  // type
-            parcel.writeInt32(static_cast<int>(paramB));  // duration
-            VideoManager::getInstance()->sendResponse(sessionId, parcel);
-            break;
-        case kVideoPacketLossInd:
+        case kVideoBitrateInd:
             parcel.writeInt32(event);
             parcel.writeInt32(static_cast<int>(paramA));
             VideoManager::getInstance()->sendResponse(sessionId, parcel);