From fa8b4792228083a4c95e8bd1c28690d44bb48bd6 Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Wed, 4 Mar 2015 16:51:05 -0800
Subject: stagefright: remove AMessage methods using id()

Bug: 19607784
Change-Id: I4b2ca396fb50cde5e7dc9801add69037febe698d
---
 media/libstagefright/foundation/ALooperRoster.cpp | 16 ----------------
 media/libstagefright/foundation/AMessage.cpp      | 12 ------------
 2 files changed, 28 deletions(-)

(limited to 'media')

diff --git a/media/libstagefright/foundation/ALooperRoster.cpp b/media/libstagefright/foundation/ALooperRoster.cpp
index 3484579..c4e6788 100644
--- a/media/libstagefright/foundation/ALooperRoster.cpp
+++ b/media/libstagefright/foundation/ALooperRoster.cpp
@@ -100,22 +100,6 @@ void ALooperRoster::unregisterStaleHandlers() {
     }
 }
 
-void ALooperRoster::getHandlerAndLooper(
-        ALooper::handler_id handlerID, wp<AHandler> *handler, wp<ALooper> *looper) {
-    Mutex::Autolock autoLock(mLock);
-
-    ssize_t index = mHandlers.indexOfKey(handlerID);
-
-    if (index < 0) {
-        handler->clear();
-        looper->clear();
-        return;
-    }
-
-    *handler = mHandlers.valueAt(index).mHandler;
-    *looper = mHandlers.valueAt(index).mLooper;
-}
-
 status_t ALooperRoster::postAndAwaitResponse(
         const sp<AMessage> &msg, sp<AMessage> *response) {
     Mutex::Autolock autoLock(mLock);
diff --git a/media/libstagefright/foundation/AMessage.cpp b/media/libstagefright/foundation/AMessage.cpp
index fbc321f..d4add15 100644
--- a/media/libstagefright/foundation/AMessage.cpp
+++ b/media/libstagefright/foundation/AMessage.cpp
@@ -43,13 +43,6 @@ AMessage::AMessage(void)
       mNumItems(0) {
 }
 
-AMessage::AMessage(uint32_t what, ALooper::handler_id target)
-    : mWhat(what),
-      mTarget(0),
-      mNumItems(0) {
-    setTarget(target);
-}
-
 AMessage::AMessage(uint32_t what, const sp<const AHandler> &handler)
     : mWhat(what),
       mNumItems(0) {
@@ -68,11 +61,6 @@ uint32_t AMessage::what() const {
     return mWhat;
 }
 
-void AMessage::setTarget(ALooper::handler_id handlerID) {
-    mTarget = handlerID;
-    gLooperRoster.getHandlerAndLooper(handlerID, &mHandler, &mLooper);
-}
-
 void AMessage::setTarget(const sp<const AHandler> &handler) {
     if (handler == NULL) {
         mTarget = 0;
-- 
cgit v1.1