Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp
* commit 'ad5499dd204a1512471778462a805a288595f2f2':
Hopefully get rid of some ANRs.
Don't hold the activity manager lock the entire time we are processing an ANR,
which often causes us to cause a second ANR as someone else calls into the
activity manager and gets blocked.
Change-Id: Ife4db82b12d6f4378ac2705bd6f60beb1244a1e6
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp
* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
Fix for bug 2548048 - it was impossible for applications to discover
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp
* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
Fix preloaded classes for API rename of BackupAgentHelper
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp
* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Bug #2553187
Limit the max number of lines for each entry in the ResolveActivity to 2. Also
make sure to discard potential styling tags and newlines/space characters from
package name and activity labels.
Change-Id: Ibda3688267aa948b921164d3d3abc8c9236e61a2
Merge commit '3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp
* commit '3f264c4fba416f55247da3fafd6afbe55bf93598':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Merge commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93' into froyo-plus-aosp
* commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93':
fix [2542425] memory leak during video recording
Merge commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp
* commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Merge commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9' into froyo-plus-aosp
* commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage
to the implementation, rather than the unwrapped one.
Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
I also realized the ROTATION_NN constants were misdocumented, they
actually align the opposite direction from the "orientation" angle
computed in the code (i.e. orientation=90 is left side up, ROTATION_90
is right side up). I just changed the comment here to keep the change
minimal; I'll update the code to be more consistent outside of this
release branch.
Bug: 2549875
Change-Id: I79c4286be582a21e730b25a8a24f2e1137c6e4cb
Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.
Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
Merge commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3' into froyo-plus-aosp
* commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3':
doc change: Indicate that only the first 8 characters of the key alias are used.
Merge commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7' into froyo-plus-aosp
* commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7':
Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
