summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added ↵Scott Main2011-11-1713-443/+1057
|\ | | | | | | | | | | | | section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio * commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3': docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
| * Merge "docs: Big update to action bar guide for ICS. Added section for ↵Scott Main2011-11-1713-443/+1057
| |\ | | | | | | | | | action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0
| | * docs: Big update to action bar guide for ICS.Scott Main2011-11-1713-443/+1057
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917 Change-Id: If61a5f2aad5ed21b0b23b3fc14309a50617f86ce
* | | am 69e24843: Merge "Licensing docs: clarifies server response for draft apps ↵Bill Gruber2011-11-171-10/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | Bug 2900690" into ics-mr0 * commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41': Licensing docs: clarifies server response for draft apps Bug 2900690
| * | Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" ↵Bill Gruber2011-11-171-10/+17
| |\ \ | | | | | | | | | | | | into ics-mr0
| | * | Licensing docs: clarifies server response for draft appsBill Gruber2011-11-161-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | Bug 2900690 Change-Id: Ibd1f14739e553bdc237fdb67322e43bef30dfd17
* | | | am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug ↵Bill Gruber2011-11-171-9/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 3055286" into ics-mr0 * commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de': Filters docs: removes references to forward-locking Bug 3055286
| * | | Merge "Filters docs: removes references to forward-locking Bug 3055286" into ↵Bill Gruber2011-11-171-9/+9
| |\ \ \ | | |_|/ | |/| | | | | | ics-mr0
| | * | Filters docs: removes references to forward-lockingBill Gruber2011-11-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug 3055286 Change-Id: Idb64984a1f3437749d9a865885bf4e0b258e60d3
* | | | am 7d4c4721: docs: add sums/sizes for adt 15.0.1Scott Main2011-11-171-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7d4c4721c6dd5473464d4620749b302a413c7ebd': docs: add sums/sizes for adt 15.0.1
| * | | docs: add sums/sizes for adt 15.0.1Scott Main2011-11-171-4/+4
| | | | | | | | | | | | | | | | Change-Id: I9dc5e429c09cb31a86d1e867f76f4d3a3997dd87
* | | | am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ↵Fred Chung2011-11-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 * commit '4750cbd9311b763265f8ab6ddee187e0c9a71665': DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
| * | | Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ↵Fred Chung2011-11-173-0/+12
| |\ \ \ | | | | | | | | | | | | | | | ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
| | * | | DO NOT MERGE: Bluetooth HDP sample.Fred Chung2011-11-163-0/+12
| | |/ / | | | | | | | | | | | | | | | | | | | | Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e Change-Id: I6f9bd5fec6e841395b9fc85d419510c81bfb620c
* | | | am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0Robert Ly2011-11-172-1/+35
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4f361741185d523b5469a264521eeeb4eee9344d': docs: adt 15.0.1 rel notes
| * | | Merge "docs: adt 15.0.1 rel notes" into ics-mr0Robert Ly2011-11-172-1/+35
| |\ \ \
| | * | | docs: adt 15.0.1 rel notesRobert Ly2011-11-142-1/+35
| | | | | | | | | | | | | | | | | | | | Change-Id: I1b8ef6cf578ff88164934250bae9a3af8d2c2200
* | | | | Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1Christopher Tate2011-11-171-0/+49
|\ \ \ \ \
| * | | | | Add a few GC-flexing microbenchmark testsChristopher Tate2011-11-171-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ObjectGc and FinalizingGc to stress single-object allocation and collection with/without the presence of finalizers. Also added GcOp() to the menu of available single-shot tests. Change-Id: I36d3254dfe2e97e504f9e4f77c8addda98ab4f4b
* | | | | | Merge "Re-enable vril-dump for adb bugreport." into ics-mr1Jake Hamby2011-11-171-3/+1
|\ \ \ \ \ \
| * | | | | | Re-enable vril-dump for adb bugreport.Jake Hamby2011-11-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vril-dump was causing adb bugreport to hang on Xoom. The OEM fixed the utility and we can now run it again as part of the bug report. Bug: 5482585 Change-Id: I1db3b50c327d50d18fb9c6327c4cd521e09f3916
* | | | | | | am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0Matthew Xie2011-11-172-7/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '6da97a24e329851888890d4e380066037d08bcd7': Check the bluetooth state for getUuid call
| * | | | | | Merge "Check the bluetooth state for getUuid call" into ics-mr0Matthew Xie2011-11-162-7/+8
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Check the bluetooth state for getUuid callMatthew Xie2011-11-162-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Donnot make the bluetoothservice.getUuids call if the bluetooth is not on. Also get rid of all the necessary locks on BluetoothService for get property call. It had a lock on BluetoothAdapterProperty. bug5472114 Change-Id: I383472ae6006fc1f0129c960c8a44ed0df027a43
* | | | | | | Merge "Fix NPE on devices that don't have NFC." into ics-mr1Nick Pelly2011-11-171-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix NPE on devices that don't have NFC.Nick Pelly2011-11-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should return null instead of NPE. Bug: 5622939 Change-Id: I802f4a99ea9f5e73453d5ea30da4e1d9fa279b9c
* | | | | | | | Merge "SIP addresses containing "911" shouldn't be considered emergency ↵David Brown2011-11-171-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | calls" into ics-mr1
| * | | | | | | | SIP addresses containing "911" shouldn't be considered emergency callsDavid Brown2011-11-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change updates isEmergencyNumberInternal() to always return false if you pass in a SIP address, since the concept of "emergency numbers" is only meaningful for calls placed over the cell network. Previously we *did* try to compare SIP addresses against the list of known emergency numbers, which caused bad behavior with SIP addresses that even contained "911"/"112"/etc as a substring (since we were filtering out non-dialable characters before doing the comparison!) TESTED: - Before this change, calls to "abc911def@example.com" or "911abcdef@example.com" were incorrectly detected as emergency numbers, and fail. - After this change, SIP addresses like "abc911def@example.com" and "911abcdef@example.com" work fine. - Also, confirmed that this change doesn't break the restriction that 3rd party apps shouldn't be able to make emergency calls. Specifically, I fired off ACTION_CALL intents (using the CallDialTest activity) for a bunch of numbers *similar* to emergency numbers, and confirmed that none of them actually resulted in an emergency call being placed. The specific ACTION_CALL intents I tested were: "911" ==> Didn't place the call; brought up dialer instead "tel:911" ==> Didn't place the call; brought up dialer instead "911@foo" ==> Tried to start a SIP call (which failed) "911%40foo" ==> Tried to start a SIP call (which failed) "tel:911@foo" ==> Tried to start a SIP call (which failed) "tel:911%40foo" ==> Tried to start a SIP call (which failed) "911@example.com" ==> Tried to start a SIP call (which failed) "sip:911" ==> Didn't place the call; brought up dialer instead "sip:911@foo" ==> Tried to start a SIP call (which failed) "sip:911%40foo" ==> Tried to start a SIP call (which failed) Bug: 5515452 Change-Id: I6f9f8690b08564c53c7a76f480654477b475d94d
* | | | | | | | | Merge "Unhide social stream permissions." into ics-mr1Dave Santoro2011-11-172-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Unhide social stream permissions.Dave Santoro2011-11-172-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5569021 Change-Id: I35ee70418be0e0286294fef54e194831b5fa3b2c
* | | | | | | | | | Merge "Draw input field focus ring in WebTextView" into ics-mr1Michael Kolb2011-11-172-4/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Draw input field focus ring in WebTextViewMichael Kolb2011-11-172-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5628053 Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
* | | | | | | | | | | Merge "Only write network stats when already loaded." into ics-mr1Jeff Sharkey2011-11-172-5/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Only write network stats when already loaded.Jeff Sharkey2011-11-172-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5584564 Change-Id: Ife2a68804bf3691e9bccdc167807204bce8a85b2
* | | | | | | | | | | Merge "Don't upgrade some settings from GB to ICS." into ics-mr1Amith Yamasani2011-11-171-10/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't upgrade some settings from GB to ICS.Amith Yamasani2011-11-161-10/+37
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the value of AUTO_TIME to AUTO_TIME_ZONE. Don't upgrade screen timeout and auto brightness. Bug: 5607851, 5217460 Also fix the default for vibrate mode. Bug: 5553900 Change-Id: I1b8d5215d55953f2b686e77bf55fd07110a08b8d
* | | | | | | | | | | Merge "Adding missed Android.mk file to the original Bluetooth HDP sample ↵Fred Chung2011-11-171-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1
| * | | | | | | | | | | Adding missed Android.mk file to the original Bluetooth HDP sample ↵Fred Chung2011-11-161-0/+2
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e. Change-Id: I23f7d4ece831ea449ecfc848dbb5733021107350
* | | | | | | | | | | Merge "Make sure not to cancel pending seek/EOS notifications on a cache ↵Andreas Huber2011-11-172-8/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underrun..." into ics-mr1
| * | | | | | | | | | | Make sure not to cancel pending seek/EOS notifications on a cache underrun...Andreas Huber2011-11-162-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or they are lost for good. Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62 related-to-bug: 5544907
* | | | | | | | | | | | Merge "Fix add single character check" into ics-mr1John Reck2011-11-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix add single character checkJohn Reck2011-11-161-3/+3
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5618801 Change-Id: I42a19855b188c9175b8f7a293faa96027685052c
* | | | | | | | | | | | Merge "Undeprecate LayoutAlgorithm" into ics-mr1John Reck2011-11-172-10/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Undeprecate LayoutAlgorithmJohn Reck2011-11-162-10/+8
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5533078 There is no alternative and this is still useful and used. It should not have been deprecated. Change-Id: I641026cf76ea87738909827b7c48a556d9021d11
* | | | | | | | | | | | Merge changes I59323dc5,I31a01aa3 into ics-mr1Ben Murdoch2011-11-171-52/+95
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: WebViewDatabase v11 for ICS. Fix a bug in the database upgrade process, and refactor slightly.
| * | | | | | | | | | | | WebViewDatabase v11 for ICS.Ben Murdoch2011-11-161-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump WebView database version to 11. This has the following effects: - Removes the old webview cookie table on GB devices. Cookies are now managed by the Chromium stack. - Removes the old webview cache database on GB devices. Cache is now managed by the Chromium stack. - Autocomplete form data is now stored/retrieved based on the URL minus the query string/fragment. Upgrade any existing form URLs in the database to match this format, so we can still use them. This will impact GB and HC devices. This has an unfortunate side effect that we may end up with duplicate URLs in the formurl table (say we had two URLS for the same host but with different query strings). Currently we only take the first url from the table - which is fine when they were unique. The simplest way to work around this is just iterate all the rows returned and use all the values we find. Bug: 5560410 Change-Id: I59323dc5e523969e0a1c268b5936d6fa998d625c
| * | | | | | | | | | | | Fix a bug in the database upgrade process, and refactor slightly.Ben Murdoch2011-11-161-49/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During upgrade from v9 -> v10 the database version was not being updated. Also remove conditionals based on what are effectively hardcoded truth values to simplfiy the logic greatly. Bug: 5560410 Change-Id: I31a01aa35a109a951d4e4c6d5b884bb666668b28
* | | | | | | | | | | | | Merge "Update NTP outside locks, log large trim events." into ics-mr1Jeff Sharkey2011-11-163-19/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Update NTP outside locks, log large trim events.Jeff Sharkey2011-11-163-19/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move NTP updates outside locks to avoid blocking ShutdownThread. Add logging around trim events that remove substantial history. Include history start in sample events. Bug: 5627247, 5584564 Change-Id: If9bbd93842c710efcdec94e68da87e9e42a5f961
* | | | | | | | | | | | | Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1Daniel Sandler2011-11-162-6/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-11-15 20:10:34 +0000