Jeff Sharkey
49ca328fc0
am debbeec5: Merge "Move deleteOlderFiles() to framework, tests." into jb-mr2-dev
...
* commit 'debbeec575b031660390e21274c66a093010ccb0':
Move deleteOlderFiles() to framework, tests.
2013-03-14 22:08:06 +00:00
Jeff Sharkey
debbeec575
Merge "Move deleteOlderFiles() to framework, tests." into jb-mr2-dev
2013-03-14 22:06:15 +00:00
Jeff Sharkey
d9526907d1
Move deleteOlderFiles() to framework, tests.
...
Supports both age and count based constraints. Added light docs and
tests to verify behavior.
Bug: 8387555
Change-Id: If4d0dac8bc54ce705c2a339bc09a60ea748728b8
2013-03-14 15:04:12 -07:00
Fabrice Di Meglio
fc8865d8cc
am b1b58023: Merge "Code BidiFormatter code" into jb-mr2-dev
...
* commit 'b1b58023ba2e4a36f2bc9c94ae6ac2be6536fac3':
Code BidiFormatter code
2013-03-14 21:54:32 +00:00
Fabrice Di Meglio
b1b58023ba
Merge "Code BidiFormatter code" into jb-mr2-dev
2013-03-14 21:52:05 +00:00
Nick Kralevich
f84f687f70
am c6ec5401: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set" into jb-mr2-dev
...
* commit 'c6ec5401539751017cf82f709a39f91cda9e8ad8':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
2013-03-14 21:47:55 +00:00
Nick Kralevich
c6ec540153
Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set" into jb-mr2-dev
2013-03-14 21:45:40 +00:00
Jean-Michel Trivi
6a0b0973cc
am a1cebc1f: Merge "Fix race in media button intent registration" into jb-mr2-dev
...
* commit 'a1cebc1f8ae2c4361078e3208ac7fa8c438fcf9c':
Fix race in media button intent registration
2013-03-14 21:41:04 +00:00
Irfan Sheriff
6f91d4c50b
am b630b7e4: Fix tether restart on settings change
...
* commit 'b630b7e426aba74bb6064afe5837472efee32363':
Fix tether restart on settings change
2013-03-14 21:37:32 +00:00
Irfan Sheriff
d75f7cb9ad
am e6db500b: Fix msg argument usage
...
* commit 'e6db500b1050b4040e04926b5473cd6872cf71b4':
Fix msg argument usage
2013-03-14 21:37:29 +00:00
Jean-Michel Trivi
a1cebc1f8a
Merge "Fix race in media button intent registration" into jb-mr2-dev
2013-03-14 21:36:16 +00:00
Irfan Sheriff
b630b7e426
Fix tether restart on settings change
...
Bug: 8320043
Change-Id: I35d84c5b0ff2b9cc62d77b7fb6a9b9076f2cb695
2013-03-14 14:34:29 -07:00
Irfan Sheriff
370d3904f7
am 11aefad9: Add support for scan always available mode
...
* commit '11aefad94de6569c4c7394e7bc5fdeb0ae60d5bb':
Add support for scan always available mode
2013-03-14 21:34:04 +00:00
Jean-Michel Trivi
eefee43964
Fix race in media button intent registration
...
AudioManager.registerMediaButtonEventReceiver maps to
AudioService.registerMediaButtonIntent
AudioManager.registerRemoteControlClient maps to
AudioService.registerRemoteControlClient
To use RemoteControlClient, an application needs to have
first registered its button event receiver. Therefore
registerMediaButtonEventReceiver() needs to have
completed registration when returning, otherwise the
RemoteControlClient registration can sometimes fail due
to the lack of association between the button event
receiver and the RemoteControlClient.
Bug 8315459
Change-Id: I82c196c3f21a65e38bad275085ed4f9ec0ec60dd
2013-03-14 14:30:25 -07:00
Irfan Sheriff
e6db500b10
Fix msg argument usage
...
Change-Id: I5b38dcbae3918a1e8c828d6e246eadf520d06c06
2013-03-14 14:29:26 -07:00
Irfan Sheriff
11aefad94d
Add support for scan always available mode
...
Modify WifiService to add a controller to track the various
desired states and let the WifiStatemachine actually control
the bring up.
Bug: 8141918
Change-Id: I6e98fd5a29b43c3c50c315eff5255cd0a3eaebcd
2013-03-14 13:55:56 -07:00
Fabrice Di Meglio
9889d559f3
Code BidiFormatter code
...
- use standard variables naming convention
Change-Id: Ic99ba5382809d1afc3bcc1527610e291fc21884f
2013-03-14 13:35:06 -07:00
Irfan Sheriff
2290e295d3
am 1c80a051: Merge "Add all variations message parameters for send/obtain." into jb-mr2-dev
...
* commit '1c80a05176c9a6cdef2975cc655f34588275194e':
Add all variations message parameters for send/obtain.
2013-03-14 20:29:34 +00:00
Irfan Sheriff
1c80a05176
Merge "Add all variations message parameters for send/obtain." into jb-mr2-dev
2013-03-14 20:26:36 +00:00
Nick Kralevich
db95ad6dd4
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
...
Bug: 8358800
Change-Id: Id81aa26d74dfd16a49f0ee5926ea2cdb3c2106d8
2013-03-14 13:23:52 -07:00
Wink Saville
8b0db52040
Add all variations message parameters for send/obtain.
...
Change-Id: Ib8f3b66650d2ae2a8af7a537871361613e65b48e
2013-03-14 13:23:19 -07:00
Robert Greenwalt
6f210bd019
Fail fast if somebody is adding default routes
...
bug:2655011
Change-Id: I25da940e024825bc6e1d1ac5fe7b0d951609c1c1
2013-03-14 13:16:04 -07:00
John Spurlock
e8b24ddd67
am adb9554d: Merge "Enable back button in keyguard security account mode." into jb-mr2-dev
...
* commit 'adb9554d993a8510bfc3866538faaa042d629731':
Enable back button in keyguard security account mode.
2013-03-14 19:58:22 +00:00
John Spurlock
adb9554d99
Merge "Enable back button in keyguard security account mode." into jb-mr2-dev
2013-03-14 19:55:17 +00:00
John Spurlock
03eca85906
Enable back button in keyguard security account mode.
...
Otherwise hitting "Forgot Pattern" traps you in account mode.
Avoid the known case where account is not backup (if permanently
locked).
Bug: 8381295
Change-Id: Ifda28eec6d0609e822b210831ff0ea0ec6cb22b1
2013-03-14 15:23:35 -04:00
Amith Yamasani
2d5e1227f6
am 0060deb6: Merge "Move the account picker class name to a config resource." into jb-mr2-dev
...
* commit '0060deb6edecd47967e8c05d41595170188a49fe':
Move the account picker class name to a config resource.
2013-03-14 19:20:40 +00:00
Amith Yamasani
0060deb6ed
Merge "Move the account picker class name to a config resource." into jb-mr2-dev
2013-03-14 19:18:44 +00:00
Amith Yamasani
12b8e134c1
Move the account picker class name to a config resource.
...
For customization in derived products.
Bug: 8379133
Change-Id: I1dba4734f322455f0b0dd9c009be2ddc8d6b7d22
2013-03-14 11:43:56 -07:00
Scott Kennedy
1a5bbe4675
am e0e448f1: Merge "Remove a method" into jb-mr2-dev
...
* commit 'e0e448f181ef5be8491bcef8e787fb96a7719c77':
Remove a method
2013-03-14 18:35:02 +00:00
Scott Kennedy
e0e448f181
Merge "Remove a method" into jb-mr2-dev
2013-03-14 18:32:35 +00:00
Robert Greenwalt
bad9c23260
am 6cf355ff: Merge "Turn on more logging to find this bug." into jb-mr2-dev
...
* commit '6cf355fff703ac5f4228459c5d6a6c5cd515bd02':
Turn on more logging to find this bug.
2013-03-14 18:03:50 +00:00
Robert Greenwalt
6cf355fff7
Merge "Turn on more logging to find this bug." into jb-mr2-dev
2013-03-14 17:59:19 +00:00
Guang Zhu
558030ee12
am 555fddb0: Merge "change how app launch is tested" into jb-mr2-dev
...
* commit '555fddb011548fb60e5abe90dd45df1cd7dd78af':
change how app launch is tested
2013-03-14 17:55:51 +00:00
Guang Zhu
555fddb011
Merge "change how app launch is tested" into jb-mr2-dev
2013-03-14 17:54:18 +00:00
Scott Kennedy
da2223f897
Remove a method
...
It was only being called in one location, and the parameter was being
ignored.
Change-Id: Ia853dd8d3898ac3e4c4b2fb3a51d103844b57ca1
2013-03-14 10:47:10 -07:00
Robert Greenwalt
bb5bcaaaed
Turn on more logging to find this bug.
...
bug:8377625
Change-Id: I0c086402122d45fc409d237a3b96d96146f1f74c
2013-03-14 10:37:56 -07:00
Chet Haase
8e035fd742
am 8fb6f418: Merge "Better fix for GL wallpaper creation" into jb-mr2-dev
...
* commit '8fb6f418bbfa5e2bd9263546fb6c7f37836b03bf':
Better fix for GL wallpaper creation
2013-03-14 17:37:35 +00:00
Chet Haase
8fb6f418bb
Merge "Better fix for GL wallpaper creation" into jb-mr2-dev
2013-03-14 17:34:54 +00:00
Craig Mautner
b7ca680485
am 67bea2ef: Merge "Remove WindowManager messages from remote queue." into jb-mr2-dev
...
* commit '67bea2ef32198e5e246715998c1d907b73225761':
Remove WindowManager messages from remote queue.
2013-03-14 16:53:21 +00:00
Craig Mautner
67bea2ef32
Merge "Remove WindowManager messages from remote queue." into jb-mr2-dev
2013-03-14 16:48:53 +00:00
Craig Mautner
ca0ac718cb
Remove WindowManager messages from remote queue.
...
When a new IME is attached it is not enough to remove the
WindowManager messages from the local queue, but the ones in
the previous IME queue must also be removed.
Fixes bug 8263462.
Change-Id: I9e916c6052a83dc7691bcba0b6ab8328b9b7cc36
2013-03-14 09:43:02 -07:00
Chet Haase
2e417be5c4
Better fix for GL wallpaper creation
...
A previous fix made initializing GL work better by calling eglMakeCurrent()
prior to querying the max texture size. However, that fix worked by creating an eglSurface
earlier than we did before, which for some reason causes problems later if wallpaper creation
fails and we back off to a software solution.
This new fix creates a temporary pbuffer surface instead, which still allows us to make the
call to eglMakeCurrent() prior to querying the max texture size, but does not result in the
later canvas lock failure if the wallpaper creation fails anyway.
Issue #8319960 sluggish yakju animations over launcher
Change-Id: I394d672549260a354f03ad9fd1b9e1f9a161a371
2013-03-14 09:38:01 -07:00
Jeff Sharkey
5d7b4a4448
am 34f37e74: Merge "Handle finished bugreports, share from private." into jb-mr2-dev
...
* commit '34f37e74125b09d13537782b602b6b4e37995ff7':
Handle finished bugreports, share from private.
2013-03-14 15:46:29 +00:00
Jeff Sharkey
34f37e7412
Merge "Handle finished bugreports, share from private." into jb-mr2-dev
2013-03-14 15:44:12 +00:00
Chet Haase
9e19ea284a
am 7534707b: Merge "Ensure wallpaper creation succeeds" into jb-mr2-dev
...
* commit '7534707b34ad7f2c8d3954d0fe8d2e6e7fcb2fc6':
Ensure wallpaper creation succeeds
2013-03-14 13:30:13 +00:00
Chet Haase
7534707b34
Merge "Ensure wallpaper creation succeeds" into jb-mr2-dev
2013-03-14 13:28:13 +00:00
Chet Haase
187e1e2fc7
Ensure wallpaper creation succeeds
...
ImageWallpaper was sometimes querying GL for a max texture size too early
(before the first call to eglMakeCurrent()). This problem caused the wallpaper
to then get created in software, resulting in noticeably slower performance
when the wallpaper was visible.
This fix ensures that the
makeCurrent happens before the query, ensuring that wallpapers of the right
size actually get created instead of failing due to this error at creation time.
Issue #8319960 sluggish yakju animations over launcher
Change-Id: I12a3eba9f1818bdf544691e0727fe12f7e820651
2013-03-14 06:24:32 -07:00
John Spurlock
356bbd1c60
am ac3dfb38: Merge "WindowManager.LayoutParams docs cleanup." into jb-mr2-dev
...
* commit 'ac3dfb38802dc42053a9ac0cbcafd0304b7b01d8':
WindowManager.LayoutParams docs cleanup.
2013-03-14 13:11:31 +00:00
John Spurlock
ac3dfb3880
Merge "WindowManager.LayoutParams docs cleanup." into jb-mr2-dev
2013-03-14 13:08:06 +00:00
The Android Automerger
ab645be68d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-14 05:55:34 -07:00