6540 Commits

Author SHA1 Message Date
Christopher Tate
755c7dc48d Merge "Support for compressed backups" 2011-07-15 15:05:53 -07:00
Christopher Tate
7bdb096289 Support for compressed backups
The backup format now includes a stream header.  That header begins with
a magic string and version number, then includes a flag stating whether
the archive data is compressed, and then in the case of encrypted archives
states the password salt used during encryption key stretching.

When compression is used, everything following the header is run through
a standard zlib "deflate" compressor before being sent downstream.

Change-Id: Ica72753e4ef2c3d13e63b45e7722a00652940a55
2011-07-15 14:55:30 -07:00
Irfan Sheriff
75683d59db Merge "WifiWatchdog rewrite to formal statemachine" 2011-07-15 14:38:04 -07:00
Mathias Agopian
700e13d7a1 Merge "dump GLES strings in SF dumpsys log" 2011-07-15 14:32:10 -07:00
Mathias Agopian
ab95117be0 dump GLES strings in SF dumpsys log
Change-Id: I438d511159b2bd915c84954f30574340017d4f47
2011-07-15 14:29:25 -07:00
Isaac Levy
654f509075 WifiWatchdog rewrite to formal statemachine
Rewrote wifiwatchdog service to use net.statemachine

Change-Id: Id6fd42b13192ac2e99f842ff50e9edff1696675d
2011-07-15 12:31:58 -07:00
Robert Greenwalt
ef75edaf0f am e1635197: am 476f5525: Small fix to 5008973 fix.
* commit 'e1635197bb6e6471b333d194855bb399da419957':
  Small fix to 5008973 fix.
2011-07-15 11:03:52 -07:00
Robert Greenwalt
d9212d3088 resolved conflicts for merge of 8550f3b8 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
2011-07-15 10:52:54 -07:00
Robert Greenwalt
e1635197bb am 476f5525: Small fix to 5008973 fix.
* commit '476f55253adc670d7290ad8c90b5adc9e4f58d3b':
  Small fix to 5008973 fix.
2011-07-15 10:20:48 -07:00
Robert Greenwalt
8550f3b86a resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
2011-07-15 09:55:48 -07:00
Robert Greenwalt
476f55253a Small fix to 5008973 fix.
Removed redundent log.
Cleaned some logic.
Will try to modify route even if recursive operation had an error.

bug: 5008973
Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da
2011-07-15 09:45:08 -07:00
Jeff Brown
997ea74ef7 Merge "Remove edge slop support." 2011-07-14 22:32:09 -07:00
Jeff Brown
a6111377e1 Remove edge slop support.
The edge slop feature was added a long time ago for a specific
device that had severe non-linear touch response issues near
the edges of its touch screen.  The feature is not useful on
modern hardware that is property calibrated.

Change-Id: I26716cbc7411c31883ddb4bb4ddd981027790d0f
2011-07-14 21:48:23 -07:00
Jeff Sharkey
4e814c348c Hide NetworkTemplate details, buffered stats I/O.
Move template matching to builder methods instead of exposing the
internal constants.  Also rule to match Ethernet usage.  Buffer
reading and writing of network stats, making operations 5x faster.

Change-Id: Iedb2d0ab3b26a976811c050f84a164e909eb74b6
2011-07-14 20:43:27 -07:00
Chia-chi Yeh
aa1727fe0c VPN: tear down VPN when the dependent interface is down.
Change-Id: I1eaf8e39ee7aed1f4ecbd4c36c2a81a68ad2f9d1
2011-07-14 19:01:40 -07:00
Robert Greenwalt
0a46db5d88 Apply the dns and route diff which we get a change
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
2011-07-14 18:12:14 -07:00
Mathias Agopian
4838151d18 Merge "sensorservice: be more robust when there are no sensor h/w" 2011-07-14 18:04:09 -07:00
Dianne Hackborn
b3a26f4d94 Merge "Move LoadAverageService to the SystemUI apk." 2011-07-14 17:23:28 -07:00
Mathias Agopian
29c176f043 sensorservice: be more robust when there are no sensor h/w
Bug: 5030108
Change-Id: I45b85b3c492b9268cb0ae44d2e5fc8c708b6e66e
2011-07-14 16:39:46 -07:00
Chia-chi Yeh
5779c9c2d9 VPN: close the socket in protectVpn() to avoid leaking descriptors.
Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354
2011-07-14 16:19:19 -07:00
Dianne Hackborn
45ce864ef4 Move LoadAverageService to the SystemUI apk.
Change-Id: I442e264802d1e35cd7d27bae121ae75f932595b6
2011-07-14 16:10:16 -07:00
Chia-chi Yeh
eb2591f8f7 Merge "VPN: Hook up the new control protocol and network state." 2011-07-14 15:22:59 -07:00
Chia-chi Yeh
97a61565ea VPN: Hook up the new control protocol and network state.
1. No more End-Of-Arguments.
2. Daemons close the control socket after they are initialized.
3. No more system properties.
4. ip-up-vpn now creates state to pass the configuration.
5. JNI methods are split again for legacy VPN.

Change-Id: I02fafdf01d425c965345ef712b2bd5fdee3a0cab
2011-07-14 15:07:42 -07:00
Wink Saville
c9822c5aea Fix build.
Changes in ConnectivityService in hc-LTE when merged with changes
happening in Master caused the build to break.

Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af
2011-07-14 12:23:28 -07:00
Wink Saville
76326a9d7d am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
  Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-14 10:55:58 -07:00
Dianne Hackborn
cadaa3a983 Merge "Improve handling of low memory." 2011-07-14 10:48:01 -07:00
Dianne Hackborn
ce86ba86df Improve handling of low memory.
Now classify background processes into a set of bins of how much
memory they should try to clear.  The last bin also involves
destroying all activities in that process.

Removed the old code for the simulator that is no longer needed
(yay).  The debugging features it had are now integrated into the
regular oom adj code.

Small fixes to load average service.

Change-Id: Ic8df401714b188c73b50dbc8f8e6345b58f1f3a0
2011-07-14 10:39:39 -07:00
Jeff Brown
9302c8796f Refactor input dispatcher use of window/app handles.
This change moves the cached window and application input state
into the handle objects themselves.  It simplifies the dispatcher
somewhat because it no longer needs to fix up references to
transient InputWindow objects each time the window list is updated.

This change will also make it easier to optimize setInputWindows
to avoid doing a lot of redundant data copying.  In principle, only
the modified fields need to be updated.  However, for now we
continue to update all fields in unison as before.

It turns out that the input dispatcher was inappropriately retaining
pointers to InputWindow objects within the mWindows InputWindow
vector.  This vector is copy-on-write so it is possible and the
item pointers to change if an editing operation is performed on
the vector when it does not exclusively own the underlying
SharedBuffer.  This bug was uncovered by a previous change that
replaced calls to clear() and appendVector() with a simple use
of operator= which caused the buffer to be shared.  Consequently
after editItemAt was called (which it shouldn't have, actually)
the buffer was copied and the cached InputWindow pointers became
invalid.  Oops.  This change fixes the problem.

Change-Id: I0a259339a6015fcf9113dc4081a6875e047fd425
2011-07-14 04:11:21 -07:00
Svetoslav Ganov
f382dc2d97 Merge "Touch exploration gesture events change the window id." 2011-07-13 17:23:41 -07:00
Svetoslav Ganov
63c04eeb00 Touch exploration gesture events change the window id.
1. Touch exploration start and end events are generated
   by the sytstem to provide additional information for
   accessibility services. Since such events do not come
   from any particular window they whould not change the
   id of the window that currently allows exploring its
   content.

2. Touch exploration start and end events were lealing the
   touch explorer class wich is private.

bug:5026258

Change-Id: Icaf3e2bd9566716f2afb876cf8e0d50813b0c76e
2011-07-13 17:22:15 -07:00
Mike Lockwood
c1b9bbb21c Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 19:45:44 -04:00
Kenny Root
a1b68687de Merge "Add StorageVolume list to MountService dump" 2011-07-13 15:53:12 -07:00
Christopher Tate
9a79cda53b Merge "Compress the backup output stream" 2011-07-13 15:37:21 -07:00
Christopher Tate
7926a693c4 Compress the backup output stream
Zlib compression, with a full flush between each application's
data.  Encryption will be performed on the already-compressed data
once that's implemented.

On restore, the streamed data is similarly uncompressed on the fly.

Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
2011-07-13 15:30:41 -07:00
Jeff Sharkey
19d2c0b0c0 Merge "Control socket tagging through Settings.Secure." 2011-07-13 15:28:06 -07:00
Jeff Sharkey
62a2c8fed9 Control socket tagging through Settings.Secure.
When NetworkManagementService starts, it determines if qtaguid
should be enabled.  The changes pushes the enabled state to a system
property to control socket tagging.

Change-Id: I5697a990dbaad4b220a2fb055931b18077d07a74
2011-07-13 15:25:11 -07:00
Wink Saville
3810361e4a am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-13 14:19:12 -07:00
Mathias Agopian
40001da8fa Merge "get rid of overlay HAL" 2011-07-13 14:07:01 -07:00
Wink Saville
e822225f7a Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
2011-07-13 13:44:13 -07:00
Jeff Brown
023e8c72e9 Merge "Revert "fix a weird use of Vector::appendVector()"" 2011-07-13 13:00:38 -07:00
Jeff Brown
b99a82437c Revert "fix a weird use of Vector::appendVector()"
This reverts commit 198fd888add624cf9e53ce31b776568a5d069916

This change seems to have exposed some other bugs.
Bug: 5026631
2011-07-13 12:51:11 -07:00
Kenny Root
4161f9b303 Add StorageVolume list to MountService dump
Change-Id: If2be6e420d9671032d2e7a66c71a6733e6e48ac8
2011-07-13 09:48:33 -07:00
Mike Lockwood
de033beae4 Merge "UsbDeviceManager: clean up HandlerThread creation" 2011-07-13 07:34:29 -07:00
Mike Lockwood
3fd13eb632 UsbDeviceManager: clean up HandlerThread creation
Change-Id: I84683b1753fcf3c3b501f8a506d6d890edf2eb37
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 09:39:54 -04:00
Jeff Sharkey
3862096cbf Merge "Include full network history around current time." 2011-07-12 20:23:03 -07:00
Jeff Sharkey
434962e44e Include full network history around current time.
When requesting historical values with time ranges, always include
full values for buckets that span current time.  (It doesn't make
sense to interpolate partial data.)  Move getTotalData() to return
full Entry objects to prepare for packet counts.

Bug: 4691901
Change-Id: I717bd721be9f1d4a47c4121e46e07a56cb15bbf1
2011-07-12 20:20:56 -07:00
Mathias Agopian
a7b28df5f0 Merge "take the state transform into account with h/w composer hal" 2011-07-12 17:36:22 -07:00
Mathias Agopian
6e62dba519 get rid of overlay HAL
Change-Id: I461f633d172ab10e05326ef10544c67dea664c0e
2011-07-12 16:04:12 -07:00
Jeff Sharkey
f0c3b1b6b7 Merge "Hide NetworkStatsHistory internals." 2011-07-12 15:19:31 -07:00
Mathias Agopian
9e37abb636 take the state transform into account with h/w composer hal
if the state transform didn't preserve rectangles, we
would still try to use h/w composer hal using the bounds
of the transformed rect, which isn't correct.

now we correctly fall back to composition.

Change-Id: Iff78f4339ece415d4987e95a5717b04934d370ab
2011-07-12 14:51:45 -07:00