102001 Commits

Author SHA1 Message Date
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
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
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
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
13c9fdefde Framework changes for 464xlat.
1. Add a Nat464Xlat service that ConnectivityService can use
   to start and stop clat. When clat is started, the service
   waits for the clat interface to come up and then calls
   ConnectivityService to add the appropriate routes.
2. Make ConnectivityService start clat when an IPv6-only mobile
   interface is connected. We only support clat on mobile for
   now.
3. Make tethering use the interface that has the IPv4 default
   route insted of using the base interface of the
   LinkProperties. This allows us to tether to a stacked
   interface, which is needed for tethering with 464xlat.

Bug: 8276725
Change-Id: I24480af69ee280f504399062638af0836a56268e
2013-03-15 14:41:55 +09: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
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
Dianne Hackborn
ca614f78be Fix a bug where we could lose a loader content change.
If AsyncTaskLoader starts a background update due to a
content change, and that update is cancelled, we drop the
data when it finally arrives and forget that the content changed.
If we later come back to the loader, we then end up showing
stale data because we don't know that we still need to update
due to the old content change.

This change adds a couple new APIs to Loader to deal with the
time between when you ask for whether there is a content change
and finally either commit the data or cancel the update.
AsyncTaskLoader is changed to make use of this so that it doesn't
lose changes.

Change-Id: I3866236b1c22bb9138f2d9f6032b126aeaee2e6e
2013-03-14 19:17:00 -07: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
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
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
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
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