summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | am 87805ca3: Updated CDMA roaming iconsJustin Ho2011-04-044-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '87805ca3a477e165891baa18efe5239a70d11bc9': Updated CDMA roaming icons
| * | Updated CDMA roaming iconsJustin Ho2011-03-294-0/+0
| | | | | | | | | | | | Change-Id: Ib455c2b7196c2c2add58422187e6d752a28364c6
* | | am bef31431: No-op - reconcile with open-source gingerbreadJean-Baptiste Queru2011-04-040-0/+0
|\ \ \ | |/ / | | | | | | * commit 'bef31431cafe100e382a3caf7ea7dce343832d68':
| * | No-op - reconcile with open-source gingerbreadJean-Baptiste Queru2011-03-290-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
* | \ \ am 27725e8c: Only leave one default network up at a time.Robert Greenwalt2011-04-041-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84': Only leave one default network up at a time.
| * | | Only leave one default network up at a time.Robert Greenwalt2011-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If original refuses to tear down, tear down new one. It's better to have none (which will try to launch them all again) than two. Really people shouldn't refuse the teardown request. bug:4183397 Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
* | | | Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" ↵Robert Greenwalt2011-04-040-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | into gingerbread-plus-aosp
| * \ \ \ resolved conflicts for merge of 7544b23e to gingerbread-plus-aospRobert Greenwalt2011-04-040-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
| | * | | 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-042-1/+133
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc': Avoid crash in system server when mounting container
| * | | | | | Merge "Avoid crash in system server when mounting container"Brad Fitzpatrick2011-04-042-1/+133
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Avoid crash in system server when mounting containerFredrik Helmer2011-04-042-1/+133
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 ↵Russell Brenner2011-03-311-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buildable * commit 'c6b22e2727bd3730edd5ad72831a9bb4670d00f3': Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
| * | | | | Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildableRussell Brenner2011-03-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
* | | | | | am 49b49f8f: Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '49b49f8fb6d094768d4e093353b34271f2da1bfc': Added include/private/hwui/DrawGlInfo.h
| * | | | | Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If50ccabb8761a994fa1f7aef4fbdb668c6160b0c
* | | | | | 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-302-4/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-4/+22
| |\ \ \ \ \
| | * | | | | DO NOT MERGE Pick upstream intf with valid IP confIrfan Sheriff2011-03-252-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-12/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '568845a766cddc4e4c222b4d9de064f8a48da990': Fix some alt-network issues.
| * | | | | | Merge "Fix some alt-network issues." into gingerbreadRobert Greenwalt2011-03-252-12/+14
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix some alt-network issues.Robert Greenwalt2011-03-252-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ad663d80: Merge from gingerbreadThe Android Open Source Project2011-03-290-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit 'ad663d8040ddd4f3e537117847f20d42797b429e': egl: fixes for object refcounts
| * | | | | | Merge from gingerbreadThe Android Open Source Project2011-03-291-20/+31
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
| | * | | | | egl: fixes for object refcountsMichael I. Gold2011-03-291-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eglMakeCurrent() would only deref the previous surfaces if the old and new contexts were the same. eglTerminate() should not touch TLS. eglReleaseThread() needs to unbind the current context. Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5 Related-Bug: 2964479
* | | | | | | am 1e7fb7ae: Merge "Error in compound cache-control header."Brad Fitzpatrick2011-03-292-1/+49
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '1e7fb7aed7b00cebc8f0e501c911727af6527523': Error in compound cache-control header.
| * | | | | | Merge "Error in compound cache-control header."Brad Fitzpatrick2011-03-292-1/+49
| |\ \ \ \ \ \
| | * | | | | | Error in compound cache-control header.Henrik Baard2011-03-292-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ↵Brad Fitzpatrick2011-03-281-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ThumbnailUtils" * commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54': Handle OutOfMemoryError when decoding images in ThumbnailUtils
| * | | | | | | Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"Brad Fitzpatrick2011-03-281-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added handling of OutOfMemoryError handling to createImageThumbnail method in ThumbnailUtils.java. During mediascanner run it would run out of memory when trying to decode very large images. Now it handles this error and returns null which is handled by the media scanner. Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
* | | | | | | | | am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"Brad Fitzpatrick2011-03-281-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42': Unregister callback from binder when vibration is removed
| * | | | | | | | Merge "Unregister callback from binder when vibration is removed"Brad Fitzpatrick2011-03-281-0/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Unregister callback from binder when vibration is removedMathias Jeppsson2011-03-241-0/+12
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating new vibration pattern, a callback is registered in case binding to caller goes away, by linkToDeath(). Need to unregister this callback when we throw away the vibration. Change-Id: Ibdf0bd415a539054ac7a66f49b33a864f729c546
* | | | | | | | 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
generated by cgit v1.1 at 2025-08-05 04:05:47 +0000