diff --git a/services/tuner/TunerHelper.cpp b/services/tuner/TunerHelper.cpp
index 0aa2391..a03386f 100644
--- a/services/tuner/TunerHelper.cpp
+++ b/services/tuner/TunerHelper.cpp
@@ -73,7 +73,7 @@
 
 // TODO: update Demux, Descrambler.
 void TunerHelper::updateTunerResources(const vector<TunerFrontendInfo>& feInfos,
-                                       const vector<int64_t>& lnbHandles) {
+                                       const vector<int32_t>& lnbHandles) {
     ::ndk::SpAIBinder binder(AServiceManager_waitForService("tv_tuner_resource_mgr"));
     shared_ptr<ITunerResourceManager> tunerRM = ITunerResourceManager::fromBinder(binder);
     if (tunerRM == nullptr) {
@@ -85,7 +85,7 @@
 }
 void TunerHelper::updateTunerResources(const vector<TunerFrontendInfo>& feInfos,
                                        const vector<TunerDemuxInfo>& demuxInfos,
-                                       const vector<int64_t>& lnbHandles) {
+                                       const vector<int32_t>& lnbHandles) {
     ::ndk::SpAIBinder binder(AServiceManager_waitForService("tv_tuner_resource_mgr"));
     shared_ptr<ITunerResourceManager> tunerRM = ITunerResourceManager::fromBinder(binder);
     if (tunerRM == nullptr) {
@@ -101,22 +101,13 @@
 }
 
 // TODO: create a map between resource id and handles.
-int TunerHelper::getResourceIdFromHandle(long resourceHandle, int /*type*/) {
-    return (int)((resourceHandle >> RESOURCE_ID_SHIFT) & RESOURCE_ID_MASK);
+int TunerHelper::getResourceIdFromHandle(int resourceHandle, int /*type*/) {
+    return (resourceHandle & 0x00ff0000) >> 16;
 }
 
-/**
- *   Generate resource handle for resourceType and id
- *   Resource Handle Allotment : 64 bits (long)
- *   8 bits - resourceType
- *   32 bits - id
- *   24 bits - resourceRequestCount
- */
-long TunerHelper::getResourceHandleFromId(int id, int resourceType) {
+int TunerHelper::getResourceHandleFromId(int id, int resourceType) {
     // TODO: build up randomly generated id to handle mapping
-    return (resourceType & RESOURCE_TYPE_MASK) << RESOURCE_TYPE_SHIFT |
-           (id & RESOURCE_ID_MASK) << RESOURCE_ID_SHIFT |
-           (sResourceRequestCount++ & RESOURCE_COUNT_MASK);
+    return (resourceType & 0x000000ff) << 24 | (id << 16) | (sResourceRequestCount++ & 0xffff);
 }
 
 }  // namespace tuner