Commit Graph

13140 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
5fcfce965f am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 00:39:44 -07:00
Jozef BABJAK
41a5ed7cd9 Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Change-Id: Ic8648aa5ae6a61348803171243c1c217feb058ec
2011-04-19 12:28:22 +02:00
Eric Fischer
68cb0ffad0 am 71a556f2: Import revised translations. DO NOT MERGE
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
  Import revised translations.  DO NOT MERGE
2011-04-12 13:02:15 -07:00
Eric Fischer
71a556f24e Import revised translations. DO NOT MERGE
Change-Id: Idd866750d0c53ae0665ef2dd6b64230182d185ae
2011-04-12 12:08:59 -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
Kenny Root
08d9d9a462 Merge "Runtime resource overlay, iteration 1." 2011-04-11 10:07:15 -07:00
Jason parks
7f506024e9 am 78a9766b: Merge "Implement teardown script." into gingerbread
* commit '78a9766be2a08e1f6a448bdb336f2afeff71a52b':
  Implement teardown script.
2011-04-04 14:42:54 -07:00
Jeff Hamilton
7bb236c3b5 am 84d34078: Make the NFC UID forward compatible.
* commit '84d340781b1e148ead9fb4790755737c9dcc1cde':
  Make the NFC UID forward compatible.
2011-04-04 14:42:44 -07:00
Eric Fischer
d20023ae44 am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
  Import revised translations.  DO NOT MERGE
2011-04-04 12:20:38 -07:00
Jason parks
1d73362597 am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
  Send out a broadcast that the system is being factory reset.
2011-04-04 12:20:33 -07:00
Brad Fitzpatrick
27e00544ea am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '9907d161584415c81de1099678f160da172fd1a6':
  Fix data corruption when writing to Bluetooth socket
2011-04-04 11:03:03 -07:00
Brad Fitzpatrick
9907d16158 Merge "Fix data corruption when writing to Bluetooth socket" 2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
9b1b643995 am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
f7a34b1598 am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container
2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
2ed7204882 Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 2011-04-04 09:41:10 -07:00
Mattias Niklewski
114f98a753 Always return a valid index from Rfc822Tokenizer.findTokenEnd()
If an invalid input string ends with a backslash inside a comment
or quoted string, the returned index would be past the end of the
string. In one case this would lead to a runtime exception being
thrown from MultiAutoCompleteTextView.performValidation.

Change-Id: If629372b429716c25cdc25764f088e95d4812d57
2011-04-04 14:52:35 +02:00
Fredrik Helmer
a20c8ef471 Avoid crash in system server when mounting container
A race condition when mounting a container in PackageHelper may cause
the system_server to crash (uncaught exception). Calling methods are
prepared to handle null, so return null instead.

Change-Id: I852ee21a2d847e37d81c1b900c27ddf94ef24fcb
2011-04-04 14:38:24 +02:00
Mike Playle
36aa8839d5 Fix data corruption when writing to Bluetooth socket
Writes to Bluetooth sockets are handled by writeNative() in
android_bluetooth_BluetoothSocket.cpp. This calls asocket_write()
which is implemented in abort_socket.c.

This latter function sleeps until poll() indicates that the socket is
writeable, then calls write() once, returning the number of bytes
written. However writeNative() just returns this byte count to the
caller; it's eventually ignored in BluetoothOutputStream.java. This
doesn't match the semantics of a Java OutputStream, which is required
to block until all bytes have been written.

This fix adds a loop to writeNative() that repeatedly calls the lower
level write function until all the data has been written (or an error
occurred in which case we should exit the loop early). With this
change it is possible to write large amounts of data to a Bluetooth
socket without experiencing data loss.

Change-Id: I0b464382817e15adec32ba0e3cb37e7d1cccc730
2011-04-04 08:56:22 +01:00
Robert Greenwalt
92d72ca01b Fix bad merge.
Add host route for a default gateway before adding the default route.
Also fixing bug were "already active" condtion of APN failed to
propagate the default gateway info, resulting in a loss of that address.

bug:4175328
Change-Id: I38f9d108693382a43e6605d56ca3963adf4eb6f4
2011-04-01 14:11:30 -07:00
Jason parks
78a9766be2 Merge "Implement teardown script." into gingerbread 2011-04-01 13:11:06 -07:00
Jason parks
ab8f48c2ee Implement teardown script.
Change-Id: I1a3feda3b1007b08fcaa24c3f8dd21abf1efd885
2011-04-01 14:41:18 -05:00
Jeff Hamilton
84d340781b Make the NFC UID forward compatible.
Change-Id: I67316ee7906c29ba11ca7c8eb36ca1b736fe59b1
2011-04-01 13:43:28 -05:00
Mårten Kongstad
57f4b77c89 Runtime resource overlay, iteration 1.
Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.

This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.

This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.

Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
2011-04-01 14:12:10 +02:00
Eric Fischer
8b312c6ca1 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-03-30 10:41:05 -07:00
Jeff Hamilton
b98967942e am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
  Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 09:30:40 -07:00
Irfan Sheriff
11ebb6f502 am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
2011-03-30 09:30:32 -07:00
Robert Greenwalt
ce6766ea51 am 568845a7: Merge "Fix some alt-network issues." into gingerbread
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
2011-03-30 09:30:15 -07:00
Jason parks
cca2f2f987 Merge "Send out a broadcast that the system is being factory reset." into gingerbread 2011-03-30 08:17:53 -07:00
Eric Fischer
5e110ec141 Import revised translations. DO NOT MERGE
Change-Id: I2d4afddb1ff99b9861647d479ef5ce2de49b684d
2011-03-29 10:54:11 -07:00
Brad Fitzpatrick
f7a9b86919 am 1e7fb7ae: Merge "Error in compound cache-control header."
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
2011-03-29 09:27:16 -07:00
Henrik Baard
eb0ced7a09 Error in compound cache-control header.
A cache control header containing both no-cache and max-age attribute does not
behave as expected.

Cache-Control: no-cache, max-age=200000

Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.

Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
2011-03-29 08:54:09 +02:00
Robert Greenwalt
7544b23e52 Merge "Fix Default route after secondary net use." into gingerbread 2011-03-26 08:58:01 -07:00
Robert Greenwalt
ecc33d43e9 Fix Default route after secondary net use.
Backport of honeycomb-mr1 change 103299 adding a host route for the
default gateway before adding the default route.
Also fixing bug where "already active" condition of APN failed to
propagate the default gateway info, result in a loss of that address.

bug:4175328
Change-Id: I4cf8605b259cf40c3631c7ce6cca4c75c1b22651
2011-03-26 08:32:25 -07:00
Jeff Hamilton
96cf34d362 Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 2011-03-25 14:53:14 -07:00
Jeff Hamilton
10de0b31df Make STOP_APP_SWITCHES signatureOrSystem.
The NFC service relies on this permission
for it's dispatching mechanism and it is
no longer signed with the platform cert.

Bug: 4173610
Change-Id: I598ad2889c4af307f04433093923255fe7daedbb
2011-03-25 16:17:53 -05:00
Irfan Sheriff
05f14e2bcf Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 2011-03-25 11:01:02 -07:00
Irfan Sheriff
c0e0dbb454 DO NOT MERGE Pick upstream intf with valid IP conf
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration

Bug: 3362306
Change-Id: I3e8ab5ef30b69f1adab755d83f5b65c078f73936
2011-03-25 10:09:55 -07:00
Robert Greenwalt
568845a766 Merge "Fix some alt-network issues." into gingerbread 2011-03-25 09:35:53 -07:00
Robert Greenwalt
7cf5b419da Fix some alt-network issues.
Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
   it is active.

bug:4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
2011-03-25 08:59:08 -07:00
Jeff Hamilton
ad91eee277 am 9c1ef098: Update the value for the NFC shared UID.
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
2011-03-24 20:21:41 -07:00
Jeff Hamilton
9c1ef09883 Update the value for the NFC shared UID.
Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
2011-03-24 21:39:58 -05:00
Huahui Wu
772f5bb189 am f440831d: DO NOT MERGE
* commit 'f440831d76817e837164ca18c7705e81d2391f87':
  DO NOT MERGE
2011-03-24 03:35:59 -07:00
Huahui Wu
f440831d76 DO NOT MERGE
b/4088884 Backport "Remove content:// protocol handler in web browser"
to Gingerbread

It's a manual cherrypick of
     https://android-git.corp.google.com/g/#change,87278
since a lot has been changed in bettween.

Change-Id: Ic8e3a419571f535bf983f32cd02181ca66d19319
2011-03-23 09:41:09 -07:00
Simon Wilson
03aa986e6b am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
  DO NOT MERGE Change WiMAX indicator display
2011-03-21 18:02:57 -07:00
Simon Wilson
1ba4897e89 Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 2011-03-21 16:58:41 -07:00
TK MUN
081148dd32 DO NOT MERGE Change WiMAX indicator display
Change WiMAX indicator display from data to signal indication
and add a new icon set.

Change-Id: I610f186e07f3d7af9e64bcbdd750371164ac51f5
2011-03-21 16:55:00 -07:00
Fred Quintana
17f95e92ed am 661e9b37: Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread
* commit '661e9b371fcc1a2aec5dfd74f2cc65db1d8a77d5':
  remove the code that clears the passwords when the sim is replaced with a different one.
2011-03-21 11:33:34 -07:00
Fred Quintana
661e9b371f Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread 2011-03-21 11:04:23 -07:00
Eric Fischer
9ac8260608 am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'c0604255a71c0b7114c3f011519160d4812a8100':
  Import revised translations.  DO NOT MERGE
2011-03-18 16:06:41 -07:00
Eric Fischer
c0604255a7 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-03-18 15:22:05 -07:00