On 09/12/2013 09:06 AM, Richard Haines wrote: > A patch in the cp_mac branch did not install cleanly as AOSP has added > additional transaction codes causing a clash (the patch header is shown > below). > > The transaction code for cp_mac support is updated (be aware that this may > happen again) and ActivityManagerNative.java fixed as installing the > original patch seems to have wiped out an end brace (}).
I couldn't apply your patch (corrupted) so I just fixed it by hand; maybe you should attach patches in the future rather than putting them inline. > > Failing patch header: >>From d23282f0f8bbcd9183b877959458ebcdaead78b9 Mon Sep 17 00:00:00 2001 > From: Charndeep Grewal <[email protected]> > Date: Thu, 21 Mar 2013 15:51:44 -0400 > Subject: [PATCH 096/364] Content provider MAC. > > --- > core/java/android/app/ActivityManagerNative.java | 23 ++++++++++++----------- > core/java/android/app/IActivityManager.java | 5 +---- > 2 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/core/java/android/app/ActivityManagerNative.java > b/core/java/android/app/ActivityManagerNative.java > index 0994681..f6e1814 100644 > --- a/core/java/android/app/ActivityManagerNative.java > +++ b/core/java/android/app/ActivityManagerNative.java > @@ -1842,17 +1842,6 @@ public abstract class ActivityManagerNative extends > Binder implements IActivityM > reply.writeLong(res); > return true; > } > - case CHECK_POLICY_TRANSACTION: { > - data.enforceInterface(IActivityManager.descriptor); > - > - int callerUid = data.readInt(); > - String destAuth = data.readString(); > - int access = data.readInt(); > - int res = checkPolicy(callerUid, destAuth, access); > - reply.writeNoException(); > - reply.writeInt(res); > - return true; > - } > > case GET_TOP_ACTIVITY_EXTRAS_TRANSACTION: { > data.enforceInterface(IActivityManager.descriptor); > @@ -1890,6 +1879,18 @@ public abstract class ActivityManagerNative extends > Binder implements IActivityM > return true; > } > > + case CHECK_POLICY_TRANSACTION: { > + data.enforceInterface(IActivityManager.descriptor); > + > + int callerUid = data.readInt(); > + String destAuth = data.readString(); > + int access = data.readInt(); > + int res = checkPolicy(callerUid, destAuth, access); > + reply.writeNoException(); > + reply.writeInt(res); > + return true; > + } > + } > return super.onTransact(code, data, reply, flags); > } > > diff --git a/core/java/android/app/IActivityManager.java > b/core/java/android/app/IActivityManager.java > index aedf37c..dfdbf80 100644 > --- a/core/java/android/app/IActivityManager.java > +++ b/core/java/android/app/IActivityManager.java > @@ -637,14 +637,11 @@ public interface IActivityManager extends IInterface { > int INPUT_DISPATCHING_TIMED_OUT_TRANSACTION = > IBinder.FIRST_CALL_TRANSACTION+158; > int CLEAR_PENDING_BACKUP_TRANSACTION = > IBinder.FIRST_CALL_TRANSACTION+159; > int GET_INTENT_FOR_INTENT_SENDER_TRANSACTION = > IBinder.FIRST_CALL_TRANSACTION+160; > -<<<<<<< HEAD > - int CHECK_POLICY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+161; > -======= > int GET_TOP_ACTIVITY_EXTRAS_TRANSACTION = > IBinder.FIRST_CALL_TRANSACTION+161; > int REPORT_TOP_ACTIVITY_EXTRAS_TRANSACTION = > IBinder.FIRST_CALL_TRANSACTION+162; > int GET_LAUNCHED_FROM_PACKAGE_TRANSACTION = > IBinder.FIRST_CALL_TRANSACTION+163; > int KILL_UID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+164; > int SET_USER_IS_MONKEY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+165; > int HANG_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+166; > ->>>>>>> intent_mac > + int CHECK_POLICY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+167; > } > -- This message was distributed to subscribers of the seandroid-list mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe seandroid-list" without quotes as the message.
