Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5487bc6a authored by Atneya Nair's avatar Atneya Nair
Browse files

[appops] Migrate IAppOpsCallback to aidl 

The aidl interface is defined in base, pull it over to use the AIDL
generated interface instead of a manually defined one for the native
IAppOpsService.

Test: compiles
Test: atest CtsMediaAudioPermissionTestCases
Bug: 322692565
Flag: EXEMPT mechanical
Change-Id: I1ce9714b6c455838b63f0582348a8c9d9e837a5b
parent 08194acf

libs/binder/include/binder/IInterface.h

+0 −1
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ constexpr const char* const kManualInterfaces[] = { 
        "android.utils.IMemory",

        "android.utils.IMemoryHeap",

        "com.android.car.procfsinspector.IProcfsInspector",

        "com.android.internal.app.IAppOpsCallback",

        "com.android.internal.app.IAppOpsService",

        "com.android.internal.app.IBatteryStats",

        "com.android.internal.os.IResultReceiver",

libs/permission/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ aidl_interface { 
    double_loadable: true,

    srcs: [

        "aidl/android/content/AttributionSourceState.aidl",

        "aidl/com/android/internal/app/IAppOpsCallback.aidl",

        "aidl/android/permission/IPermissionChecker.aidl",

    ],

}
@@ -36,7 +37,6 @@ cc_library { 
    ],

    srcs: [

        "AppOpsManager.cpp",

        "IAppOpsCallback.cpp",

        "IAppOpsService.cpp",

        "android/permission/PermissionChecker.cpp",

    ],

libs/permission/IAppOpsCallback.cpp

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#define LOG_TAG "AppOpsCallback"



#include <binder/IAppOpsCallback.h>



#include <utils/Log.h>

#include <binder/Parcel.h>

#include <utils/String8.h>



namespace android {



// ----------------------------------------------------------------------



class BpAppOpsCallback : public BpInterface<IAppOpsCallback>

{

public:

    explicit BpAppOpsCallback(const sp<IBinder>& impl)

        : BpInterface<IAppOpsCallback>(impl)

    {

    }



    virtual void opChanged(int32_t op, const String16& packageName) {

        Parcel data, reply;

        data.writeInterfaceToken(IAppOpsCallback::getInterfaceDescriptor());

        data.writeInt32(op);

        data.writeString16(packageName);

        remote()->transact(OP_CHANGED_TRANSACTION, data, &reply, IBinder::FLAG_ONEWAY);

    }

};



IMPLEMENT_META_INTERFACE(AppOpsCallback, "com.android.internal.app.IAppOpsCallback")



// ----------------------------------------------------------------------



// NOLINTNEXTLINE(google-default-arguments)

status_t BnAppOpsCallback::onTransact(

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{

    switch(code) {

        case OP_CHANGED_TRANSACTION: {

            CHECK_INTERFACE(IAppOpsCallback, data, reply);

            int32_t op = data.readInt32();

            String16 packageName;

            (void)data.readString16(&packageName);

            opChanged(op, packageName);

            return NO_ERROR;

        } break;

        default:

            return BBinder::onTransact(code, data, reply, flags);

    }

}



} // namespace android

libs/permission/include/binder/IAppOpsCallback.h→libs/permission/aidl/com/android/internal/app/IAppOpsCallback.aidl

+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,44 +14,8 @@ 
 * limitations under the License.

 */



#pragma once

package com.android.internal.app;



#ifndef __ANDROID_VNDK__



#include <binder/IInterface.h>



namespace android {



// ----------------------------------------------------------------------



class IAppOpsCallback : public IInterface

{

public:

    DECLARE_META_INTERFACE(AppOpsCallback)



    virtual void opChanged(int32_t op, const String16& packageName) = 0;



    enum {

        OP_CHANGED_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION

    };

};



// ----------------------------------------------------------------------



class BnAppOpsCallback : public BnInterface<IAppOpsCallback>

{

public:

    // NOLINTNEXTLINE(google-default-arguments)

    virtual status_t    onTransact( uint32_t code,

                                    const Parcel& data,

                                    Parcel* reply,

                                    uint32_t flags = 0);

};



// ----------------------------------------------------------------------



} // namespace android



#else // __ANDROID_VNDK__

#error "This header is not visible to vendors"

#endif // __ANDROID_VNDK__
 
oneway interface IAppOpsCallback {

    void opChanged(int op, int uid, String packageName, String persistentDeviceId);

}

libs/permission/include/binder/AppOpsManager.h

+3 −3
Original line number Diff line number Diff line
@@ -180,10 +180,10 @@ public: 
    void finishOp(int32_t op, int32_t uid, const String16& callingPackage,

            const std::optional<String16>& attributionTag);

    void startWatchingMode(int32_t op, const String16& packageName,

            const sp<IAppOpsCallback>& callback);

            const sp<com::android::internal::app::IAppOpsCallback>& callback);

    void startWatchingMode(int32_t op, const String16& packageName, int32_t flags,

            const sp<IAppOpsCallback>& callback);

    void stopWatchingMode(const sp<IAppOpsCallback>& callback);

            const sp<com::android::internal::app::IAppOpsCallback>& callback);

    void stopWatchingMode(const sp<com::android::internal::app::IAppOpsCallback>& callback);

    int32_t permissionToOpCode(const String16& permission);

    void setCameraAudioRestriction(int32_t mode);