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

Commit 66f91640 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "reflect libbinder->libpermission: appops" am: 12d2d7fd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674207

Change-Id: Idf5634a8b157dba1ffd6ebe5fb748b4a727669b4
parents cc0c3a5f 12d2d7fd

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
@@ -32,7 +32,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);

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

services/incremental/Android.bp

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

        "libincfs",

        "liblog",

        "libpermission",

        "libz",

        "libziparchive",

    ],