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

Commit 8728d85d authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "reflect libbinder->libpermission: appops" into sc-dev

parents bc6f53f0 3c8c5369

core/java/com/android/internal/app/IAppOpsCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.internal.app;



// This interface is also used by native code, so must

// be kept in sync with frameworks/native/libs/binder/include/binder/IAppOpsCallback.h

// be kept in sync with frameworks/native/libs/permission/include/binder/IAppOpsCallback.h

oneway interface IAppOpsCallback {

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

}

core/java/com/android/internal/app/IAppOpsService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.internal.app.MessageSamplingConfig; 


interface IAppOpsService {

    // These methods are also called by native code, so must

    // be kept in sync with frameworks/native/libs/binder/include/binder/IAppOpsService.h

    // be kept in sync with frameworks/native/libs/permission/include/binder/IAppOpsService.h

    // and not be reordered

    int checkOperation(int code, int uid, String packageName);

    SyncNotedAppOp noteOperation(int code, int uid, String packageName, @nullable String attributionTag,

services/incremental/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ cc_defaults { 
        "libcutils",

        "libincfs",

        "liblog",

        "libpermission",

        "libz",

    ],

}