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

Commit 23567494 authored by Péter Visontay's avatar Péter Visontay Committed by Android (Google) Code Review
Browse files

Merge "Fix some paths (in comments) pointing to old locations of C++ Binder interfaces."

parents ff35dd0e cee76326

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ interface IActivityManager { 
    // below block of transactions.



    // Since these transactions are also called from native code, these must be kept in sync with

    // the ones in frameworks/native/include/binder/IActivityManager.h

    // the ones in frameworks/native/libs/binder/include/binder/IActivityManager.h

    // =============== Beginning of transactions used on native side as well ======================

    ParcelFileDescriptor openContentUri(in String uriString);

    // =============== End of transactions used on native side as well ============================

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/include/binder/IAppOpsCallback.h

// be kept in sync with frameworks/native/libs/binder/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
@@ -22,7 +22,7 @@ import com.android.internal.app.IAppOpsCallback; 


interface IAppOpsService {

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

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

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

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

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

    int startOperation(IBinder token, int code, int uid, String packageName);

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.telephony.SignalStrength; 


interface IBatteryStats {

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

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

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

    void noteStartSensor(int uid, int sensor);

    void noteStopSensor(int uid, int sensor);

    void noteStartVideo(int uid);