Yu Shan Emily Lau
795ad7916a
am 4f394b00: am d6bbe3b2: Merge "Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop." into jb-mr2-dev
...
* commit '4f394b006bf61163bcdafd2c4a6c58807c498793':
Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop.
2013-03-15 01:31:47 +00:00
Yu Shan Emily Lau
4f394b006b
am d6bbe3b2: Merge "Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop." into jb-mr2-dev
...
* commit 'd6bbe3b2ed82ac78415a06596b807b33f0cbe66d':
Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop.
2013-03-15 01:28:43 +00:00
Yu Shan Emily Lau
d6bbe3b2ed
Merge "Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop." into jb-mr2-dev
2013-03-15 01:27:02 +00:00
Yu Shan Emily Lau
984505d816
Media test clean up.
...
Remove duplicated camera preview stress test.
Remove duplicated recorder stress test.
Remove camera recorder switching stress test.
Reduced the total number of iterations for all the stress loop.
Change-Id: I447f8060fadd0599c160727fb7dda8a4cc384656
2013-03-14 18:14:54 -07:00
Nick Kralevich
2bbe99b370
am 754c4716: am fd31ee49: am 6098579a: am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"
...
* commit '754c47164f8903521d3e46a8ad1f9961fde94040':
Don't use ADDR_COMPAT_LAYOUT on the emulator
2013-03-15 00:26:56 +00:00
Nick Kralevich
754c47164f
am fd31ee49: am 6098579a: am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"
...
* commit 'fd31ee4996b67be51f5f4c94d8ee2d55695a01bc':
Don't use ADDR_COMPAT_LAYOUT on the emulator
2013-03-15 00:24:17 +00:00
Nick Kralevich
fd31ee4996
am 6098579a: am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"
...
* commit '6098579a205848339cf6886f5c6d476ccf40e6fe':
Don't use ADDR_COMPAT_LAYOUT on the emulator
2013-03-14 17:21:38 -07:00
Nick Kralevich
6098579a20
am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"
...
* commit '1ae6ae2094fd0ab8c82ad1a347e7a8bd67d995e5':
Don't use ADDR_COMPAT_LAYOUT on the emulator
2013-03-14 17:20:12 -07:00
Nick Kralevich
1ae6ae2094
Merge "Don't use ADDR_COMPAT_LAYOUT on the emulator"
2013-03-14 23:46:20 +00:00
Nick Kralevich
5fa1ee779e
Don't use ADDR_COMPAT_LAYOUT on the emulator
...
For the emulator, we want people to see memory as it
actually is, not how we're hacking around buggy apps. Don't
set ADDR_COMPAT_LAYOUT on the emulator.
For reasons that I don't understand, personality(ADDR_COMPAT_LAYOUT)
does not persist across an exec on the emulator. app_main gets
into a tight loop restarting itself because of this. This change
also works around that bug.
Change-Id: Ia73a7d2d623c25cf39d248145d97307945d554da
2013-03-14 16:31:34 -07:00
Nick Kralevich
b4a0de7325
am 2d5a9769: am 41c9c8e5: am 31a7345c: am f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
...
* commit '2d5a976928b72a600102445d3dfa7219ec04b6b1':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
2013-03-14 23:22:32 +00:00
Nick Kralevich
2d5a976928
am 41c9c8e5: am 31a7345c: am f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
...
* commit '41c9c8e5847b0d252673e9cceda0c4bc8c843fa1':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
2013-03-14 23:19:37 +00:00
Nick Kralevich
41c9c8e584
am 31a7345c: am f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
...
* commit '31a7345c9c9398c18d6fb6fa4118bd2bfdb437e2':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
2013-03-14 16:16:43 -07:00
Nick Kralevich
31a7345c9c
am f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
...
* commit 'f732108e86fcc9825d5ecaa0b65ee91469c4a24c':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
2013-03-14 16:14:10 -07:00
Robert Greenwalt
654e7a199e
am 6ddc39f7: am bb5b7a26: Merge "Fail fast if somebody is adding default routes" into jb-mr2-dev
...
* commit '6ddc39f7299c4e2494f6852f2c4171fb04230e79':
Fail fast if somebody is adding default routes
2013-03-14 23:08:38 +00:00
Robert Greenwalt
6ddc39f729
am bb5b7a26: Merge "Fail fast if somebody is adding default routes" into jb-mr2-dev
...
* commit 'bb5b7a264969a961291e0cce9b16678f78151b48':
Fail fast if somebody is adding default routes
2013-03-14 23:03:54 +00:00
Robert Greenwalt
bb5b7a2649
Merge "Fail fast if somebody is adding default routes" into jb-mr2-dev
2013-03-14 23:02:28 +00:00
Nick Kralevich
f732108e86
Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
2013-03-14 22:28:01 +00:00
Nick Kralevich
8a0a929422
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
...
Bug: 8358800
Change-Id: Id81aa26d74dfd16a49f0ee5926ea2cdb3c2106d8
2013-03-14 15:21:12 -07:00
Jeff Sharkey
e7a4e42d3d
am 49ca328f: am debbeec5: Merge "Move deleteOlderFiles() to framework, tests." into jb-mr2-dev
...
* commit '49ca328fc0c3bdb090b323e5bae23bfb696e6099':
Move deleteOlderFiles() to framework, tests.
2013-03-14 22:10:40 +00:00
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
14506d8b73
am fc8865d8: am b1b58023: Merge "Code BidiFormatter code" into jb-mr2-dev
...
* commit 'fc8865d8ccb22797dc571055c463f871bdf80665':
Code BidiFormatter code
2013-03-14 21:57:18 +00: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
b6452ba746
am f84f687f: am c6ec5401: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set" into jb-mr2-dev
...
* commit 'f84f687f7066d3e2361376be4b04d08c707057b1':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
2013-03-14 21:50:26 +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
88730b9cdc
am 6a0b0973: am a1cebc1f: Merge "Fix race in media button intent registration" into jb-mr2-dev
...
* commit '6a0b0973cc133bf1a67c51b5b0f026b0f891a0ca':
Fix race in media button intent registration
2013-03-14 21:43:37 +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
91aa839c5a
am 6f91d4c5: am b630b7e4: Fix tether restart on settings change
...
* commit '6f91d4c50b56bd48cf54c953323cae91ff2fb499':
Fix tether restart on settings change
2013-03-14 21:39:59 +00:00
Irfan Sheriff
8f9a0195cc
am d75f7cb9: am e6db500b: Fix msg argument usage
...
* commit 'd75f7cb9ad668282a3722800bd5a82b1263cb71f':
Fix msg argument usage
2013-03-14 21:39:56 +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
Irfan Sheriff
fd5c559d63
am 370d3904: am 11aefad9: Add support for scan always available mode
...
* commit '370d3904f7f3360f7e2aa637795d197c84924886':
Add support for scan always available mode
2013-03-14 21:36:33 +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
4471f15ec5
am 2290e295: am 1c80a051: Merge "Add all variations message parameters for send/obtain." into jb-mr2-dev
...
* commit '2290e295d3250db0fb44ad0445c33429cbf9b62f':
Add all variations message parameters for send/obtain.
2013-03-14 20:31:29 +00: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
ef9f5276f2
am e8b24ddd: am adb9554d: Merge "Enable back button in keyguard security account mode." into jb-mr2-dev
...
* commit 'e8b24ddd6769a431b8fa3462e00c85211787a08d':
Enable back button in keyguard security account mode.
2013-03-14 19:59:58 +00:00