[appops] Migrate native IAppOpsCallback to aidl

Move IAppOpsCallback to frameworks/native for use in both java and
native.

Fix-up callsites with fully qualified package name and the correct
arguments.

Test: compiles
Test: atest CtsMediaAudioPermissionTestCases
Test: atest service.incremental_test
Bug: 322692565
Flag: EXEMPT mechanical
Change-Id: I8d5fff5ef86e0b2d68df4a95745fe430134fe1f0

1 files changed, 4 insertions, 3 deletions

diff --git a/services/incremental/IncrementalService.h b/services/incremental/IncrementalService.h
index b81e1b1b071c..4ee1a70dc34c 100644
--- a/services/incremental/IncrementalService.h
+++ b/services/incremental/IncrementalService.h
@@ -26,7 +26,7 @@
 #include <android/os/incremental/BnStorageLoadingProgressListener.h>
 #include <android/os/incremental/PerUidReadTimeouts.h>
 #include <android/os/incremental/StorageHealthCheckParams.h>
-#include <binder/IAppOpsCallback.h>
+#include <binder/AppOpsManager.h>
 #include <binder/PersistableBundle.h>
 #include <utils/String16.h>
 #include <utils/StrongPointer.h>
@@ -200,11 +200,12 @@ public:
 
     void getMetrics(int32_t storageId, android::os::PersistableBundle* _aidl_return);
 
-    class AppOpsListener : public android::BnAppOpsCallback {
+    class AppOpsListener : public com::android::internal::app::BnAppOpsCallback {
     public:
         AppOpsListener(IncrementalService& incrementalService, std::string packageName)
               : incrementalService(incrementalService), packageName(std::move(packageName)) {}
-        void opChanged(int32_t op, const String16& packageName) final;
+        binder::Status opChanged(int32_t op, int32_t uid, const String16& packageName,
+                                 const String16& persistentDeviceId) final;
 
     private:
         IncrementalService& incrementalService;