summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-1113-0/+297
|\ | | | | | | | | * commit '08d9d9a46250c4fad66e9b637e8898a3524c4286': Runtime resource overlay, iteration 1.
| * Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-1113-0/+297
| |\
| | * Runtime resource overlay, iteration 1.Mårten Kongstad2011-04-0113-0/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 78a9766b: Merge "Implement teardown script." into gingerbreadJason parks2011-04-043-1/+92
|\ \ \ | | | | | | | | | | | | | | | | * commit '78a9766be2a08e1f6a448bdb336f2afeff71a52b': Implement teardown script.
| * \ \ Merge "Implement teardown script." into gingerbreadJason parks2011-04-013-1/+92
| |\ \ \
| | * | | Implement teardown script.Jason parks2011-04-013-1/+92
| | | | | | | | | | | | | | | Change-Id: I1a3feda3b1007b08fcaa24c3f8dd21abf1efd885
* | | | | am 84d34078: Make the NFC UID forward compatible.Jeff Hamilton2011-04-041-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '84d340781b1e148ead9fb4790755737c9dcc1cde': Make the NFC UID forward compatible.
| * | | | Make the NFC UID forward compatible.Jeff Hamilton2011-04-011-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: I67316ee7906c29ba11ca7c8eb36ca1b736fe59b1
* | | | am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-04-048-20/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984': Import revised translations. DO NOT MERGE
| * | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-03-308-20/+18
| |\ \ \
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-03-298-20/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I2d4afddb1ff99b9861647d479ef5ce2de49b684d
* | | | | am cca2f2f9: Merge "Send out a broadcast that the system is being factory ↵Jason parks2011-04-042-5/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | reset." into gingerbread * commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce': Send out a broadcast that the system is being factory reset.
| * | | | Merge "Send out a broadcast that the system is being factory reset." into ↵Jason parks2011-03-302-5/+21
| |\ \ \ \ | | |/ / / | |/| | | | | | | | gingerbread
| | * | | Send out a broadcast that the system is beingJason parks2011-03-162-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | factory reset. Change-Id: I339b7ce58cb3f48316103be49b582d4f7e9b63bf
| * | | | Merge "Fix Default route after secondary net use." into gingerbreadRobert Greenwalt2011-03-262-0/+5
| |\ \ \ \
| | * | | | Fix Default route after secondary net use.Robert Greenwalt2011-03-262-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"Brad Fitzpatrick2011-04-041-7/+13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '9907d161584415c81de1099678f160da172fd1a6': Fix data corruption when writing to Bluetooth socket
| * | | | | Merge "Fix data corruption when writing to Bluetooth socket"Brad Fitzpatrick2011-04-041-7/+13
| |\ \ \ \ \
| | * | | | | Fix data corruption when writing to Bluetooth socketMike Playle2011-04-041-7/+13
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 2ed72048: Merge "Always return a valid index from ↵Brad Fitzpatrick2011-04-042-2/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rfc822Tokenizer.findTokenEnd()" * commit '2ed72048828cf9f617da971e5d2b8a062de08e5b': Always return a valid index from Rfc822Tokenizer.findTokenEnd()
| * | | | | Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"Brad Fitzpatrick2011-04-042-2/+19
| |\ \ \ \ \
| | * | | | | Always return a valid index from Rfc822Tokenizer.findTokenEnd()Mattias Niklewski2011-04-042-2/+19
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am e558a000: Merge "Avoid crash in system server when mounting container"Brad Fitzpatrick2011-04-041-0/+131
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc': Avoid crash in system server when mounting container
| * | | | | Avoid crash in system server when mounting containerFredrik Helmer2011-04-041-0/+131
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Fix bad merge.Robert Greenwalt2011-04-012-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbreadJeff Hamilton2011-03-301-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '96cf34d362a1666683e813af915e4f6e0d1b38a0': Make STOP_APP_SWITCHES signatureOrSystem.
| * | | | Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbreadJeff Hamilton2011-03-251-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Make STOP_APP_SWITCHES signatureOrSystem.Jeff Hamilton2011-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into ↵Irfan Sheriff2011-03-301-0/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '05f14e2bcf78be62b35e85902408ea66103a3881': DO NOT MERGE Pick upstream intf with valid IP conf
| * | | | Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbreadIrfan Sheriff2011-03-251-0/+18
| |\ \ \ \
| | * | | | DO NOT MERGE Pick upstream intf with valid IP confIrfan Sheriff2011-03-251-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 568845a7: Merge "Fix some alt-network issues." into gingerbreadRobert Greenwalt2011-03-301-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '568845a766cddc4e4c222b4d9de064f8a48da990': Fix some alt-network issues.
| * | | | | Merge "Fix some alt-network issues." into gingerbreadRobert Greenwalt2011-03-251-0/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix some alt-network issues.Robert Greenwalt2011-03-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 1e7fb7ae: Merge "Error in compound cache-control header."Brad Fitzpatrick2011-03-291-1/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '1e7fb7aed7b00cebc8f0e501c911727af6527523': Error in compound cache-control header.
| * | | | | Error in compound cache-control header.Henrik Baard2011-03-291-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 9c1ef098: Update the value for the NFC shared UID.Jeff Hamilton2011-03-241-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '9c1ef098837bd73044cb970545344dd03f66daa0': Update the value for the NFC shared UID.
| * | | | | Update the value for the NFC shared UID.Jeff Hamilton2011-03-241-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
* | | | | am f440831d: DO NOT MERGEHuahui Wu2011-03-242-2/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f440831d76817e837164ca18c7705e81d2391f87': DO NOT MERGE
| * | | | DO NOT MERGEHuahui Wu2011-03-232-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into ↵Simon Wilson2011-03-213-20/+38
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '1ba4897e89fc30042a086b26755dfdb80af258dd': DO NOT MERGE Change WiMAX indicator display
| * | | | Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbreadSimon Wilson2011-03-213-20/+38
| |\ \ \ \
| | * | | | DO NOT MERGE Change WiMAX indicator displayTK MUN2011-03-213-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change WiMAX indicator display from data to signal indication and add a new icon set. Change-Id: I610f186e07f3d7af9e64bcbdd750371164ac51f5
* | | | | | am 661e9b37: Merge "remove the code that clears the passwords when the sim ↵Fred Quintana2011-03-211-91/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Merge "remove the code that clears the passwords when the sim is replaced ↵Fred Quintana2011-03-211-91/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | with a different one." into gingerbread
| | * | | | remove the code that clears the passwords when the simFred Quintana2011-03-071-91/+0
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is replaced with a different one. DO NOT MERGE patched from honeycomb-mr1 Bug: 3404577 Change-Id: If11fc6be817ca1fa3dd5c085ff9696a1c5ea3a03
* | | | | am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-03-1841-428/+642
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c0604255a71c0b7114c3f011519160d4812a8100': Import revised translations. DO NOT MERGE
| * | | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-03-1841-428/+642
| |\ \ \ \
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-03-1841-428/+642
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48a01203c2db75bc6a1c6dc251264780d845443d
* | | | | | am 125be9c8: Merge "Fixing a race condition in RecognitionService" into ↵Valentin Kravtsov2011-03-181-2/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '125be9c85a3bf71add2841d4195905c1e681a83e': Fixing a race condition in RecognitionService
generated by cgit v1.1 at 2024-10-30 12:25:27 +0000