commit 47e1ff99c573c49cdea75056898c1a423e7581c2
author Satish Yalla <satishy@google.com> Fri Aug 16 07:34:23 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 16 07:34:49 2024 +0000
tree 17489a6d6f21a3d00164ee4a374ad9db38b63c5c
parent 11c1052d41eb7ccdb556929e0c86dcb20bac67bb

Revert "ResourceHandle : Refactor resourceHandle data type to long"

Revert submission 28771115-cherrypicker-L41100030005737508:N83900030090946413

Reason for revert: Droidmonitor created revert due to b/360262704. Will be verifying through ABTD before submission.


Reverted changes: /q/submissionid:28771115-cherrypicker-L41100030005737508:N83900030090946413

Change-Id: I7c79ec308f31ff1c3d7e76ea7bf24aa6bbfd515c

services/tuner/TunerHelper.cpp

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