21411 Commits

Author SHA1 Message Date
Steve Block
7aa74c3d7a Merge "First bits of WebDriver containing blocking function to load a page and fetching the page source." 2011-04-14 11:07:04 -07:00
Dianne Hackborn
44329ad519 Merge "Rewrite battery history storage." 2011-04-14 10:58:28 -07:00
Dianne Hackborn
0ffc988a7f Rewrite battery history storage.
We now write battery history directly into a buffer, instead of
creating objects.  This allows for more efficient storage; later
it can be even better because we can only write deltas.

The old code is still there temporarily for validation.

Change-Id: I9707d4d8ff30855be8ebdc93bc078911040d8e0b
2011-04-14 10:57:22 -07:00
Dounia Berrada
600780bb2e First bits of WebDriver containing blocking function to load a page and
fetching the page source.

bug: 3457555
Change-Id: I5fbeb7f6103f1e1af04b7a6964cde5710338ee6e
2011-04-14 10:51:00 -07:00
Gilles Debunne
4b428dc215 Merge "Fix around suggestionSpan." 2011-04-14 10:38:05 -07:00
Elliott Hughes
d195e5ab40 Replace a custom AndroidRuntime::findClass with a more targeted fix.
This seems simpler and more contained, and I think the comment explaining
why hoop-jumping is necessary is a bit clearer now.

Change-Id: Ief4afd7cbb42188ed835fce23e497520bdb753a8
2011-04-13 16:43:15 -07:00
Gilles Debunne
a00972ab9a Fix around suggestionSpan.
Since the kind was unknown, doing a copy/cut on text with a SuggestionSpan crashed.

Change-Id: I10c0677b3587897b82c794db57d7b07149f12e09
2011-04-13 16:07:34 -07:00
Xia Wang
5cde33b7d1 am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
* commit 'a4b76ff4911538f01e92af2f3fa3f4016ad0e290':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 16:05:07 -07:00
Xia Wang
a4b76ff491 am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
* commit 'd69ec89f5d31064174d79e2e77504814629cffa6':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:52:39 -07:00
Xia Wang
d69ec89f5d am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:34:29 -07:00
Xia Wang
46b59ef01b Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 2011-04-13 15:13:10 -07:00
Steve Block
62e3dee27d Merge "Fix a typo in FrameLayout JavaDoc" 2011-04-13 11:10:17 -07:00
Elliott Hughes
13f3683d93 Merge "More native code cleanup." 2011-04-13 11:09:57 -07:00
Steve Block
1ba7b7efae Fix a typo in FrameLayout JavaDoc
Change-Id: I8b016aff1f790fbeaf435170c1ff33455ec91204
2011-04-13 18:37:17 +01:00
Elliott Hughes
f17b971a75 More native code cleanup.
Use ScopedUtfChars (fixes a leak in TrafficStats, and fixes a crash in Wifi in
a case where GetStringChars could have been called with a pending exception).

Change-Id: I3465ff392b4038dfdafa6af80ec1314cc6d6a11c
2011-04-13 10:34:23 -07:00
Elliott Hughes
f9dc3db273 Merge "Use an @hide libcore API to get the FileDescriptor from a Socket." 2011-04-13 10:18:03 -07:00
Elliott Hughes
e9cf71dfd0 Merge "Don't allocate a raw object then call its constructor manually..." 2011-04-13 10:17:46 -07:00
Wu-cheng Li
fda06c0cd9 Merge "Add camera metering area API." 2011-04-13 01:14:42 -07:00
Wu-cheng Li
e98e4c8063 Add camera metering area API.
The API are still hidden.

bug:3475893
Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
2011-04-13 16:06:47 +08:00
Dianne Hackborn
0c5001d776 Add APIs to remove tasks.
You can remove sub-tasks inside of a task, or an entire task.

When removing an entire task, you can have its process killed
as well.

When the process is killed, any running services will get an
onTaskRemoved() callback for them to do cleanup before their
process is killed (and the service possibly restarted).

Or they can set a new android:stopWithTask attribute to just
have the service automatically (cleanly) stopped at this point.

Change-Id: I1891bc2da006fa53b99c52f9040f1145650e6808
2011-04-12 18:28:06 -07:00
Elliott Hughes
cf6f7a0f00 Don't allocate a raw object then call its constructor manually...
We can do this in one step.

Change-Id: Id6b70c83002038caf62fe89cc769eca54ae0c055
2011-04-12 17:50:45 -07:00
Elliott Hughes
4cb1753ec6 Remove useless forward declarations.
Change-Id: I8f191367acb18ea9a3f807e791099e0485b1b249
2011-04-12 16:10:26 -07:00
Elliott Hughes
4390758f27 Use an @hide libcore API to get the FileDescriptor from a Socket.
Saves having your own native code...

Change-Id: Ib082a6530bcf743a35031500cee6318bc92d4d35
2011-04-12 14:25:23 -07:00
Kenny Root
461fa8b05d resolved conflicts for merge of 18490fb9 to master
Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
2011-04-12 12:51:08 -07:00
Elliott Hughes
d3a6956a6d Merge "More native code cleanup." 2011-04-12 12:09:01 -07:00
Doug Zongker
a4f39a6edd Merge "protect all /cache/recovery/last_* files from deletion" 2011-04-12 11:30:47 -07:00
Elliott Hughes
dd66bcbf9d More native code cleanup.
Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.

Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
2011-04-12 11:28:59 -07:00
Kenny Root
18490fb93e resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
2011-04-12 10:27:15 -07:00
Elliott Hughes
ae447967b5 Merge "Kill the global references in the OpenGL wrappers." 2011-04-12 10:19:11 -07:00
Doug Zongker
3d5040f8d4 protect all /cache/recovery/last_* files from deletion
Preserve any files name /cache/recovery/last_*, not just last_log,
when booting.

Change-Id: Ie36da5b9552e4a7100ecf3774fb1a8aaa22bfdbd
2011-04-12 09:23:51 -07:00
Benoit Goby
0b9b8711a1 am 43be7a61: EthernetDataTracker: implement setDependencyMet
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
  EthernetDataTracker: implement setDependencyMet
2011-04-11 20:23:42 -07:00
Benoit Goby
43be7a6120 EthernetDataTracker: implement setDependencyMet
Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
2011-04-11 20:13:10 -07:00
Benoit Goby
316594715d am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
2869d1715d resolved conflicts for merge of 08c39c6a to honeycomb-LTE
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Elliott Hughes
4a1ba21044 Merge "You don't need to poke around inside FileDescriptor manually." 2011-04-11 17:27:53 -07:00
Elliott Hughes
a3804cf77f You don't need to poke around inside FileDescriptor manually.
We can help you with that.

Note also that getParcelFileDescriptorFD did no such thing. All its callers
were passing in a regular java.io.FileDescriptor and expecting the int. No
ParcelFileDescriptors involved.

Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
2011-04-11 17:04:01 -07:00
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Gilles Debunne
e9f05b0079 Merge "Fix in BreakIterator." 2011-04-11 16:21:38 -07:00
Kenny Root
87b3c0dcc4 am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
  Runtime resource overlay, iteration 1.
2011-04-11 15:33:19 -07:00
Elliott Hughes
24ce5fb2cc Kill the global references in the OpenGL wrappers.
Just use jniThrowException instead. Note that it would be trivial to throw
seemingly more appropriate exceptions (NullPointerException and
OutOfMemoryException in particular), but I'm only attempting to preserve
existing behavior here.

I also found shadowing bugs in some of the special-case functions, which
would previously always have leaked memory.

This also moves an accidental change to a generated file (ActivityThread ->
AppGlobals) into the generator, so it won't be overwritten in future.

Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590
2011-04-11 15:31:20 -07:00
Eric Fischer
f60cee57f5 Merge "Import revised translations." 2011-04-11 14:36:47 -07:00
Jason parks
3ef8b7463c am f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread
* commit 'f953d3e2eac2af121e4b83f6bf613e0800fd7952':
  Implement teardown script.
2011-04-11 14:28:30 -07:00
Jeff Hamilton
40c266ef48 am a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
* commit 'a83bc160892078c20489897190ee163d5c4d3783':
  Make the NFC UID forward compatible.
2011-04-11 14:28:27 -07:00
Eric Fischer
64eecc0755 Import revised translations.
Change-Id: Ib8940867bc7a807284dbb1297b5856e352690850
2011-04-11 14:25:44 -07:00
Jason parks
f953d3e2ea am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
  Implement teardown script.
2011-04-11 14:24:06 -07:00
Jeff Hamilton
a83bc16089 am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
  Make the NFC UID forward compatible.
2011-04-11 14:23:59 -07:00
Amith Yamasani
beb182a494 Merge "Package manager changes to store and update user information." 2011-04-11 12:14:17 -07:00
Amith Yamasani
4b2e934928 Package manager changes to store and update user information.
Some API stubs for managing users and storing their details.
List of users is stored in an xml file.
Each user's properties are stored in a separate xml file.

Some unit tests for modifying the XML files.

Change-Id: If2ce2420723111bd426f6762def3c2afc19a0ae5
2011-04-11 12:12:58 -07:00
Wink Saville
37e344cbe2 am 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
* commit '1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf':
  Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:11:14 -07:00
Wink Saville
1b00dc66d4 am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
  Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:08:19 -07:00