On 09/12/2013 09:48 AM, Stephen Smalley wrote: > 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.
In looking at this, I realized that we've allowed the intent_mac and cp_mac local_manifest.xml files to fall behind the changes to master, and that we hadn't merged the latest SEAdmin changes to intent_mac for quite a while. That should all be fixed now, but you'll need to fetch an updated local_manifest.xml file before repo sync'ing. -- 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.
