Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e'
* commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'
* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
HTTP Live content that are tagged as complete are now seekable.
Merge commit '78a76fea28b8101c1860a2f1115329e3e63abda3' into gingerbread-plus-aosp
* commit '78a76fea28b8101c1860a2f1115329e3e63abda3':
Revert to using epoll_wait().
Added support for calibrating touch size for devices that report
size as an area measurement rather than as a width.
Fixed some bugs.
Bug: 3096045
Change-Id: I30a12e73752883516ed054f8af407204bca45814
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.
Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
Conflicts:
Android.mk
CleanSpec.mk
core/java/android/app/ContextImpl.java
Merge commit 'b593d976137389dcbe061f10ec13d79f0427baa3' into gingerbread-plus-aosp
* commit 'b593d976137389dcbe061f10ec13d79f0427baa3':
Updated GPS icons and new status bar background
Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp
* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
DO NOT MERGE: Private API to pass the selected tab through QuickContacts
+ Keep the wake lock for 500ms. (Some measurements on N1 indicate 160~180ms
needed to bring up InCallScreen but since INVITE doesn't come in frequently
we can be more generous just to be safe.)
+ Move MyWakeupLock out of SipService so SipSessionGroup can use it without
awkward inter-dependency with SipService.
+ Add acquire(int timeout) to be used to create the "timed" wake lock.
http://b/issue?id=3081828
Change-Id: Iffd1d78d1a5cae9f795252ada75310917095204d
- Pass to surface flinger whether we want animations or not.
- Don't use the animation when the screen goes off because of the prox sensor.
- Turn the screen-on animation back off
- Also, now the animation setting controls whether or not we do the animation.
Bug: 3097475
Bug: 3098508
Change-Id: I205d5564d6668b33a8dc1c40d8cc06c4aad305cf
Merge commit '1fefe88cd0509df1e04e349f3caef7e5826d3e90' into gingerbread-plus-aosp
* commit '1fefe88cd0509df1e04e349f3caef7e5826d3e90':
Another attempt at popup assets (hdpi and mdpi)
Media framework test permissions were not updated when commit
14beea487c065ca902bfd7089399eb71a805e302 added
MODIFY_AUDIO_SETTINGS permission check for global effects.
Change-Id: I2a97be74f33d62fbb749642b1e7a26ddf92378f2
Merge commit '043581382e43acbe29a8a62420bc765f49a9dd90' into gingerbread-plus-aosp
* commit '043581382e43acbe29a8a62420bc765f49a9dd90':
[3095807] screen takes a long time to turn on
* Properly wipe the thumbnail canvas before handing it to the app for
its contents to be drawn
* Provide a getView() method in DragThumbnailBuilder that allows
clients or subclasses to get at the associated view. This is
especially for clients that want to draw entire (sub)layouts as
the drag thumbnail, by overriding onDrawThumbnail(Canvas c)
like this:
// Override specifically for drawing a whole ViewGroup into
// the drag thumbnail canvas
@Override
public void onDrawThumbnail(Canvas c) {
getView().dispatchDraw(c);
}
Change-Id: Ib43ddd7cf1d44faf2d7f6ba79f102bc3c7f14596
PBAP profile is associated with HFP profile. Disconnect PBAP
profile while disconnecting HFP profile. We ever never doing this
and were expecting the remote end to do it. So when the user
disconnects a headset, we will end up with the ACL link still up
because PBAP has not been disconnected.
This is little bit of a hack till PBAP profile is converted to
use the new profile APIs.
Change-Id: I04821daae6588955fbfea01472e6a1b6f9212608
