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/TunerService.h

diff --git a/services/tuner/TunerService.h b/services/tuner/TunerService.h
index 07b414e..190ccd4 100644
--- a/services/tuner/TunerService.h
+++ b/services/tuner/TunerService.h
@@ -61,20 +61,20 @@
     virtual ~TunerService();
 
     ::ndk::ScopedAStatus getFrontendIds(vector<int32_t>* out_ids) override;
-    ::ndk::ScopedAStatus getFrontendInfo(int32_t in_frontendId,
+    ::ndk::ScopedAStatus getFrontendInfo(int32_t in_frontendHandle,
                                          FrontendInfo* _aidl_return) override;
-    ::ndk::ScopedAStatus openFrontend(int64_t in_frontendHandle,
+    ::ndk::ScopedAStatus openFrontend(int32_t in_frontendHandle,
                                       shared_ptr<ITunerFrontend>* _aidl_return) override;
-    ::ndk::ScopedAStatus openLnb(int64_t in_lnbHandle,
+    ::ndk::ScopedAStatus openLnb(int32_t in_lnbHandle,
                                  shared_ptr<ITunerLnb>* _aidl_return) override;
     ::ndk::ScopedAStatus openLnbByName(const string& in_lnbName,
                                        shared_ptr<ITunerLnb>* _aidl_return) override;
-    ::ndk::ScopedAStatus openDemux(int64_t in_demuxHandle,
+    ::ndk::ScopedAStatus openDemux(int32_t in_demuxHandle,
                                    shared_ptr<ITunerDemux>* _aidl_return) override;
     ::ndk::ScopedAStatus getDemuxCaps(DemuxCapabilities* _aidl_return) override;
-    ::ndk::ScopedAStatus getDemuxInfo(int64_t in_demuxHandle, DemuxInfo* _aidl_return) override;
+    ::ndk::ScopedAStatus getDemuxInfo(int32_t in_demuxHandle, DemuxInfo* _aidl_return) override;
     ::ndk::ScopedAStatus getDemuxInfoList(vector<DemuxInfo>* _aidl_return) override;
-    ::ndk::ScopedAStatus openDescrambler(int64_t in_descramblerHandle,
+    ::ndk::ScopedAStatus openDescrambler(int32_t in_descramblerHandle,
                                          shared_ptr<ITunerDescrambler>* _aidl_return) override;
     ::ndk::ScopedAStatus getTunerHalVersion(int32_t* _aidl_return) override;
     ::ndk::ScopedAStatus openSharedFilter(const string& in_filterToken,
@@ -94,7 +94,7 @@
     void updateTunerResources();
     vector<TunerFrontendInfo> getTRMFrontendInfos();
     vector<TunerDemuxInfo> getTRMDemuxInfos();
-    vector<int64_t> getTRMLnbHandles();
+    vector<int32_t> getTRMLnbHandles();
 
     shared_ptr<ITuner> mTuner;
     int mTunerVersion = TUNER_HAL_VERSION_UNKNOWN;