drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,329 Commits 1 Branch 0 Tags
Commit Graph

102329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
36b314587f am 93a2fde9: am faf0e89c: Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev 
* commit '93a2fde962618e46b2d5668807a19c720273fd3d':
  Make release() behaves the same way as other part of media framework
 2013-03-15 18:46:17 +00:00
ztenghui
93a2fde962 am faf0e89c: Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev 
* commit 'faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89':
  Make release() behaves the same way as other part of media framework
 2013-03-15 18:44:22 +00:00
ztenghui
faf0e89ce3 Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev 2013-03-15 18:41:34 +00:00
Lorenzo Colitti
e33ec6e9a6 am c09d7cbf: am c60967fd: Merge "Don\'t update routes if Dhcp fails." into jb-mr2-dev 
* commit 'c09d7cbf2b5d590b39ff2282d6e3c9f1d971dd01':
  Don't update routes if Dhcp fails.
 2013-03-15 18:14:42 +00:00
Lorenzo Colitti
c09d7cbf2b am c60967fd: Merge "Don\'t update routes if Dhcp fails." into jb-mr2-dev 
* commit 'c60967fd83e7a736f311a1887543df430a65164c':
  Don't update routes if Dhcp fails.
 2013-03-15 18:09:39 +00:00
Lorenzo Colitti
480fe47208 am 540f002c: am b91e50c2: Fix build. 
* commit '540f002c0b481ae39e1c028a2ea7b9d686119af9':
  Fix build.
 2013-03-15 18:07:44 +00:00
Lorenzo Colitti
c60967fd83 Merge "Don't update routes if Dhcp fails." into jb-mr2-dev 2013-03-15 18:06:20 +00:00
Lorenzo Colitti
540f002c0b am b91e50c2: Fix build. 
* commit 'b91e50c266a7eb9dd6f8171deb497931ef7aef76':
  Fix build.
 2013-03-15 18:06:04 +00:00
Robert Greenwalt
28cdf1dc22 Don't update routes if Dhcp fails. 
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
 2013-03-15 10:48:46 -07:00
Lorenzo Colitti
b91e50c266 Fix build. 
Change-Id: Iac84a5f35d7fcaebd096e605a4590f8c90fe97b0
 2013-03-16 02:42:30 +09:00
Lorenzo Colitti
3f8cbf3f61 am aa003546: am e78aa896: Merge "Set routes from stacked links as well." into jb-mr2-dev 
* commit 'aa0035464b30d3ad3a758e20b1da7ffd4d4deda5':
  Set routes from stacked links as well.
 2013-03-15 17:20:15 +00:00
Lorenzo Colitti
aa0035464b am e78aa896: Merge "Set routes from stacked links as well." into jb-mr2-dev 
* commit 'e78aa8964766e5e2a9684de13176b08b7bd09e06':
  Set routes from stacked links as well.
 2013-03-15 17:17:38 +00:00
Lorenzo Colitti
51bbb5cb93 am beb9dfaa: am 827ef6e0: Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev 
* commit 'beb9dfaa1c6d7586f26f49ae4a4cbfaed49b4991':
  Add stacking to the NetworkStateTrackers.
 2013-03-15 17:16:48 +00:00
Lorenzo Colitti
4359c23873 am 3a2eb126: am 8d0e2618: Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev 
* commit '3a2eb126ad342d6aa02c79646b9364e5369ed21c':
  Add stacked interfaces to LinkProperties.
 2013-03-15 17:16:45 +00:00
Lorenzo Colitti
e78aa89647 Merge "Set routes from stacked links as well." into jb-mr2-dev 2013-03-15 17:14:43 +00:00
Lorenzo Colitti
beb9dfaa1c am 827ef6e0: Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev 
* commit '827ef6e0bd696b2cd0ff8d2bf28e4564b913c345':
  Add stacking to the NetworkStateTrackers.
 2013-03-15 17:14:10 +00:00
Lorenzo Colitti
3a2eb126ad am 8d0e2618: Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev 
* commit '8d0e261849af603e95b3da00c0d2e11be503ef62':
  Add stacked interfaces to LinkProperties.
 2013-03-15 17:14:07 +00:00
Lorenzo Colitti
827ef6e0bd Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev 2013-03-15 17:11:30 +00:00
Lorenzo Colitti
8d0e261849 Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev 2013-03-15 17:09:00 +00:00
Chet Haase
d370c54801 am c584f7f4: am b38258f3: Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev 
* commit 'c584f7f44e4629e97e662e66f2a135ddb426fc7a':
  Fix erroneous requestLayout-during-layout issues
 2013-03-15 14:34:02 +00:00
Chet Haase
c584f7f44e am b38258f3: Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev 
* commit 'b38258f357a7857ce5d53caad0af9c38053ab071':
  Fix erroneous requestLayout-during-layout issues
 2013-03-15 14:31:55 +00:00
Chet Haase
b38258f357 Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev 2013-03-15 14:29:41 +00:00
Lorenzo Colitti
f83d90c667 Set routes from stacked links as well. 
Currently, ConnectivityService adds and removes routes to/from
the routing table only based on the LinkProperties's routes.
Make it update routes based on the stacked links as well.

Bug: 8276725
Change-Id: I9a2adf537af5a04de0aaab3780afbcc3bb5c6acb
 2013-03-15 14:35:38 +09:00
Lorenzo Colitti
69edd64d9b Add stacking to the NetworkStateTrackers. 
Bug: 8276725
Change-Id: I55a107fea78f9cc84f15bd6c75292138fb35a1b6
 2013-03-15 14:35:35 +09:00
Lorenzo Colitti
419a4ce9e4 Add stacked interfaces to LinkProperties. 
Bug: 8276725
Change-Id: I2f592d4c690e9af0459ae742ab16107a10d89353
 2013-03-15 14:35:32 +09:00
Wink Saville
5a78ba9984 am 11652313: am 33c5857c: Merge "Revert "Fail fast if somebody is adding default routes"" into jb-mr2-dev 
* commit '11652313428403a6409a8120ed404b214def8cb2':
  Revert "Fail fast if somebody is adding default routes"
 2013-03-15 05:12:14 +00:00
Wink Saville
1165231342 am 33c5857c: Merge "Revert "Fail fast if somebody is adding default routes"" into jb-mr2-dev 
* commit '33c5857c54a67de62917beae6c2dfd8b5ca3dce8':
  Revert "Fail fast if somebody is adding default routes"
 2013-03-15 05:10:08 +00:00
Wink Saville
33c5857c54 Merge "Revert "Fail fast if somebody is adding default routes"" into jb-mr2-dev 2013-03-15 05:07:41 +00:00
Wink Saville
7b5fd05d4e Revert "Fail fast if somebody is adding default routes" 
This reverts commit 6f210bd0191e1936bbc1f036912c6efc4ea69475

Mako wouldn't boot for me, reverting for now.

Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7
 2013-03-15 05:07:04 +00:00
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
ztenghui
a83df76859 Make release() behaves the same way as other part of media framework 
bug:7991013

Change-Id: Ib3efa94c0a6a599f71517f80fb7c3842d8d4e74f
 2013-03-14 16:02:45 -07: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