Adam Powell
2f5485587b
Merge "Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if called before onResume()"
2011-08-18 18:10:03 -07:00
Dianne Hackborn
937ffc174c
Merge "Fix issue #5180553 : permission RECEIVE_BOOT_COMPLETED is not checked"
2011-08-18 18:05:19 -07:00
Jim Miller
53bd70301d
Merge "Fix 5149726: Add slight delay to initial lock screen 'ping' animation."
2011-08-18 17:46:57 -07:00
Jim Miller
cd2bad41af
Fix 5149726: Add slight delay to initial lock screen 'ping' animation.
...
This adds a slight delay before the first ping animation runs. The
idea is to ensure enough time for the display to come on and the user
to notice the animation.
Change-Id: I3d981f5d50efa14683bb08cf6a1430244ce67e55
2011-08-18 17:45:33 -07:00
Christopher Tate
eeb2214213
Merge "Stop leaking DeathRecipient and BinderProxy instances"
2011-08-18 17:19:53 -07:00
Christopher Tate
86284c60b5
Stop leaking DeathRecipient and BinderProxy instances
...
The native-side death recipient object holds a global reference
to the DVM-side DeathRecipient instance. This is necessary so
that the DeathRecipient isn't GC'd early in the case when the
caller of linkToDeath() doesn't retain their own reference to
the recipient instance.
However, that global reference was never being released in
association with the delivery of the actual binderDied() event.
In that case, if the death recipient did not explicitly call
unlinkToDeath() themselves, the hard global reference was
maintained and a hard-reference cycle was perpetuated, crossing
the native <-> DVM boundary. This was visible as a gradual
leakage of DVM-side DeathRecipient and BinderProxy instances.
The one problematic constraint is that it needs to be valid to
call unlinkToDeath() cleanly *after* binderDied() is delivered
to the given recipient; that requires that we have the hard reference
linkage described above. The fix is to replace the hard global
reference with a weak reference to the DVM-side DeathRecipient
after we deliver binderDied() to that recipient. In the case
where the caller has retained their own reference to the instance
(i.e. they might still call unlinkToDeath() on it later), the
weak reference stays live and everything works cleanly (and is
reaped explicitly by unlinkToDeath() as usual). In the case where
the caller has *not* retained the instance to call unlinkToDeath()
themselves, demoting to a weak DeathRecipient reference allows
the DeathRecipient to be GC'd, which in turn frees the DVM-side
BinderProxy it's tied to, and so on around the chain to free
all of the associated allocations.
Fixes bug 5174537
Change-Id: Ia4ad76e667140cc2a1b74508bbba652ab31ab876
2011-08-18 17:06:31 -07:00
Adam Powell
993a63abb9
Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if
...
called before onResume()
Change-Id: I2c21f2bfb3314426d9dfd3b874f593f375c7838a
2011-08-18 16:35:53 -07:00
Adam Powell
931f0b8c07
Merge "Fix bug 5099037 - No delete option when multiple videos are selected"
2011-08-18 16:24:19 -07:00
Adam Powell
23f4cc0353
Fix bug 5099037 - No delete option when multiple videos are selected
...
Fix some bugs related to how action item slots are allocated in menus.
Fix some padding/margins in ActivityChooserView.
Change-Id: I12096b0165daca902c5bc8e24c1e8d54a35e9557
2011-08-18 16:19:31 -07:00
Dianne Hackborn
d99b293d5f
Fix issue #5180553 : permission RECEIVE_BOOT_COMPLETED is not checked
...
Change-Id: I069673f2fbdf05e409c5e9ed99ccd1e15b4fe3ed
2011-08-18 16:02:41 -07:00
Nicolas Roard
fc8f2ca621
Merge "Modify nativeSetProperty to return a boolean indicating if we need to invalidate the content or not."
2011-08-18 15:45:27 -07:00
Fabrice Di Meglio
b7f4d117d2
Merge "Update BiDiTest app"
2011-08-18 15:17:53 -07:00
Gloria Wang
0bf049c635
Merge "When switching surface, do not set mSeekNotificationSent as true, because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug 5181272."
2011-08-18 15:14:36 -07:00
Jeff Sharkey
9a20fa54c9
Merge "Background data notification, API clean up."
2011-08-18 15:01:10 -07:00
Gloria Wang
3c578f2d6a
When switching surface, do not set mSeekNotificationSent as true,
...
because there could be a previous uncompleted seeking which needs
to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent
as true here, then mediaplayer.cpp will be waiting for message
MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return
the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp.
Fix for bug 5181272.
Change-Id: I290aff29b6d9ec8db67c66abbe1f352a43f57073
2011-08-18 14:52:36 -07:00
Xavier Ducrohet
1797d6086f
am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
...
* commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa':
Change generated dependency file names
2011-08-18 14:51:43 -07:00
Adam Powell
6ccadb04a4
Merge "Fix bug 5185010 - android:backgroundSplit doesn't accept a color value"
2011-08-18 14:49:27 -07:00
Xavier Ducrohet
d98e1be20e
am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
...
* commit 'f4750724cf8db972a052cb388dc9a39fc7aa6dd6':
Change generated dependency file names
2011-08-18 14:48:49 -07:00
Xavier Ducrohet
f4750724cf
am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
...
* commit '9d829f98dc19edecb2305b61b9c79517c4f95383':
Change generated dependency file names
2011-08-18 14:45:36 -07:00
Xavier Ducrohet
9d829f98dc
am 21e6e2de: Merge "Change generated dependency file names"
...
* commit '21e6e2de1f0062f949fcc52d0b4559dfa3246e0e':
Change generated dependency file names
2011-08-18 14:41:56 -07:00
Adam Powell
73f2677dc0
Fix bug 5185010 - android:backgroundSplit doesn't accept a color value
...
Let both backgroundSplit and backgroundStacked take raw color values.
Change-Id: I05035d6b29bf2973b23da2faf2943d56cba7755f
2011-08-18 14:32:11 -07:00
Jamie Gennis
c8f4c6a5d0
Merge "SurfaceTexture: fix queues-to-composer"
2011-08-18 14:31:39 -07:00
Xavier Ducrohet
21e6e2de1f
Merge "Change generated dependency file names"
2011-08-18 14:29:15 -07:00
repo sync
a8993e10f9
Merge "Use supplicant control channel interface for p2p"
2011-08-18 13:43:52 -07:00
Adam Powell
843c3545d5
Merge "Fix bug 5183775 - Action bar custom layouts with default gravity misbehave"
2011-08-18 13:21:56 -07:00
Fabrice Di Meglio
af3e6d64d1
Update BiDiTest app
...
- add a default TextView
Change-Id: I0ce92503204e370d9c928440cdd4876701c6c4cb
2011-08-18 13:12:43 -07:00
Daniel Sandler
35e8eda7e1
Merge "Don't resize & dim system status icons, only notifications."
2011-08-18 12:52:57 -07:00
Daniel Sandler
64b12615bc
Merge "Remove 'no notifications' label for now."
2011-08-18 12:52:12 -07:00
Daniel Sandler
7579bca7a0
Don't resize & dim system status icons, only notifications.
...
Also lots more debugging info.
Bug: 5164743
Change-Id: I10db182b27def835888af15d1237329048ca52c4
2011-08-18 15:47:26 -04:00
repo sync
2b8edd0c48
Use supplicant control channel interface for p2p
...
Bug: 5002384
Change-Id: Id2131ef43a01288e84178a5b21d289b97db9d736
2011-08-18 12:40:17 -07:00
Daniel Sandler
d714148bd2
Remove 'no notifications' label for now.
...
Bug: 5160106
Change-Id: Icd22f10689b4ec119d5fd43f1f3a8706c214530e
2011-08-18 15:14:52 -04:00
Jaikumar Ganesh
5293bfa57a
am 294539df: am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '294539df2c05eb62c417e25b2e1c8a71474b09e6':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:13:30 -07:00
Jaikumar Ganesh
294539df2c
am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '3e9413473f87ad17f3767ffbb0c57046c2db29be':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:10:02 -07:00
Jaikumar Ganesh
3e9413473f
am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '6f6b21b407a8883b92b3de9e028e4dc1550b9648':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:08:05 -07:00
Jaikumar Ganesh
6f6b21b407
am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '4733d3a6bf10334c93ffbf42e6e850cacbaadd55':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:06:25 -07:00
Jaikumar Ganesh
4733d3a6bf
Merge "Bluetooth event loop dispatches dbus data on wakeup"
2011-08-18 12:02:35 -07:00
Adam Powell
7a2424d041
Fix bug 5183775 - Action bar custom layouts with default gravity misbehave
...
Change-Id: I314822ed9617d2c1de55e1f3238f1ca8899393f3
2011-08-18 11:59:27 -07:00
Nicolas Roard
872cf224f3
Modify nativeSetProperty to return a boolean indicating if we
...
need to invalidate the content or not.
corresponding C++ CL: https://android-git.corp.google.com/g/#/c/129130/
bug:5167645
Change-Id: I48a3dd252e2a7ef24f3828e1e2955f86867423dd
2011-08-18 11:53:04 -07:00
Andreas Huber
3d01812f5e
Merge "Some decoders require more gentle treatment"
2011-08-18 11:46:18 -07:00
James Dong
5bc53035bd
Some decoders require more gentle treatment
...
We sacrifice A/V sync to some extent to enable the decoder to recover from
temporary bottlenecks.
Change-Id: I16195091ad752bfad4c70869cdd7e9f28ca3a118
related-to-bug: 5180142
2011-08-18 11:43:34 -07:00
Adam Powell
97382f2e8e
Merge "Fix bug 5183332 - monkeys are jerks"
2011-08-18 11:30:48 -07:00
Andreas Huber
eacfe83888
Merge "Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording."
2011-08-18 11:10:58 -07:00
Adam Powell
84f4936dee
Fix bug 5183332 - monkeys are jerks
...
Change-Id: I15beb7b55ff5809b95dc869a9b0c43c49d1571c6
2011-08-18 11:09:57 -07:00
Brian Muramatsu
583b163feb
Merge "Test for Settings Intent"
2011-08-18 10:57:46 -07:00
Chris Craik
da2f8df48b
Merge "Removed setExtendedTileBounds"
2011-08-18 10:56:40 -07:00
Andreas Huber
4960f3a67c
Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording.
...
Change-Id: I982e740e8488ff8717ca5f081db9def55aabc9ec
related-to-bug: 5179033
2011-08-18 10:53:23 -07:00
Jeff Sharkey
11a8c027e4
Merge "Preferences padding and scrollbars to match spec."
2011-08-18 10:52:03 -07:00
Chris Craik
cb41847901
Removed setExtendedTileBounds
...
bug:5178457
for real this time
Change-Id: I4f40206d66feb8ddf6fd844e9fe5cce2096317bc
2011-08-18 10:24:16 -07:00
JP Abgrall
0197d825f1
Merge "core/java NetworkManagement: Don't untag sockets willy-nilly"
2011-08-18 09:58:32 -07:00
Kenny Root
d1106fc9bf
Merge "Default disable watchdog for vold connection"
2011-08-18 09:20:47 -07:00