summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | | | | Fix lease duration handlingIrfan Sheriff2011-06-151-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert lease time in seconds to long before alarm set up and add sanity check Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
* | | | | | | | | | | | | | | | | am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into ↵Wink Saville2011-06-152-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'aff9ec70e22abb64149e335ae2eb519c6027eb4a': Clean up some debug statements.
| * | | | | | | | | | | | | | | | am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTEWink Saville2011-06-152-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d6233b2edd24c83efe10f4403456b8d0c87241a': Clean up some debug statements.
| | * | | | | | | | | | | | | | | Merge "Clean up some debug statements." into honeycomb-LTEWink Saville2011-06-152-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Clean up some debug statements.Wink Saville2011-06-152-6/+8
| | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
* | | | | | | | | | | | | | | | | am 27f889d0: am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the ↵Dianne Hackborn2011-06-152-9/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compat mode UI: * commit '27f889d07ced48fbc7fa61c41a4a32ec3e1a95f3': Clean up some edge cases in the compat mode UI:
| * | | | | | | | | | | | | | | | am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI:Dianne Hackborn2011-06-152-9/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3dc1b5e26fac2c6a6161d617f99fd901ee2ffc9e': Clean up some edge cases in the compat mode UI:
| | * | | | | | | | | | | | | | | am ed31bbf6: Clean up some edge cases in the compat mode UI:Dianne Hackborn2011-06-152-9/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | * commit 'ed31bbf65267c1f383dd0dff37acd034f3b9b59f': Clean up some edge cases in the compat mode UI:
| | | * | | | | | | | | | | | | Clean up some edge cases in the compat mode UI:Dianne Hackborn2011-06-152-9/+29
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't put up multiple dialogs if a switch happens between activities that both can use compat mode. - Remove the help dialog if the user switches away from an app that can use compat mode. - Don't set the "don't show" preference until the user explicitly hits the button. - Hide the compat mode switch UI if the compat mode button is hidden. Change-Id: I8dd2aab1385a264232a9256284d4a75b8e058e47
* | | | | | | | | | | | | | | am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to ↵Marco Nelissen2011-06-154-0/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread-plus-aosp * commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6': Ignore duplicate WAP push PDU source/destination port if configured
| * | | | | | | | | | | | | | am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aospMarco Nelissen2011-06-154-0/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0': Ignore duplicate WAP push PDU source/destination port if configured
| | * | | | | | | | | | | | | resolved conflicts for merge of d027329c to gingerbread-plus-aospMarco Nelissen2011-06-154-0/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I169c415bf998b9935ab36812511573db05717b91
| | | * | | | | | | | | | | | Ignore duplicate WAP push PDU source/destination port if configuredSoojung Shin2011-06-104-1/+69
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some carriers duplicate the OMADM wap push PDU source/destination port. e.g. MSGTYPE-TotalSegments-CurrentSegment -SourcePortDestPort-SourcePortDestPort-OMADM PDU So the client has to ignore the duplicate source/destination port. Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4 Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
* | | | | | | | | | | | | | Merge "Added vcard query parameter for not attaching photo."Martijn Coenen2011-06-151-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added vcard query parameter for not attaching photo.Martijn Coenen2011-06-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4968ba54d00c368240f50fa43bcc647ccf2c199
* | | | | | | | | | | | | | Merge "VPN: change some strings in VPN notifications."Chia-chi Yeh2011-06-152-21/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | VPN: change some strings in VPN notifications.Chia-chi Yeh2011-06-152-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove a small piece of dead code. Change-Id: Idd10f3d72a92228951278bf360d08ba9bede02d2
* | | | | | | | | | | | | | Merge "Fix NetworkPolicy tests after notifications."Jeff Sharkey2011-06-151-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix NetworkPolicy tests after notifications.Jeff Sharkey2011-06-151-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I569e9ceba6d89459b347ed151fd9bda2909dc892
* | | | | | | | | | | | | | Merge "Modified Voicemail.SOURCE_DATA value to match with the constant name."Debashish Chatterjee2011-06-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Modified Voicemail.SOURCE_DATA value to match with the constant name.Debashish Chatterjee2011-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a83b553ace640a91cd07e89785d52d5b7cd86ca
* | | | | | | | | | | | | | | Merge "Include template in data warning/limit intents."Jeff Sharkey2011-06-152-11/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Include template in data warning/limit intents.Jeff Sharkey2011-06-152-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When launching warning/limit UI, include the template that triggered the notification. Also move actions and extra into contract class. Change-Id: Id2e63fd2d2e36a137a3fd8f889c7256038ca5f2e
* | | | | | | | | | | | | | | Merge "Fix Gravity start/end"Fabrice Di Meglio2011-06-154-40/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix Gravity start/endFabrice Di Meglio2011-06-144-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix missing attribute value change - update BiDiTest app Change-Id: I0bb8a1ebf0b6097b7b8d488580fea6e882202e23
* | | | | | | | | | | | | | | Merge "de_DE "Mai" isn't an abbreviation."Elliott Hughes2011-06-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | de_DE "Mai" isn't an abbreviation.Elliott Hughes2011-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5cf493bacf5082a67e3dfe7629b062e9a47e3773
* | | | | | | | | | | | | | | | Merge "Swipe to veto in notifications."Daniel Sandler2011-06-151-15/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Swipe to veto in notifications.Daniel Sandler2011-06-131-15/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yeah, it's pretty cool. Change-Id: I2a4405a413ba9d1e521aa52a9a8c8e459583f9d0
* | | | | | | | | | | | | | | | | Merge "Bug 4579629. Send before and after text when suggestion is picked."Gilles Debunne2011-06-151-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Bug 4579629. Send before and after text when suggestion is picked.Gilles Debunne2011-06-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf8ad50b19e7301ece1a5a7a13b3bc604c817fd6
* | | | | | | | | | | | | | | | | | Merge "Support for getting the background color"John Reck2011-06-151-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Support for getting the background colorJohn Reck2011-06-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58a52f79e5a50dbb2cd1ba81d13e95ed9a1b7095
* | | | | | | | | | | | | | | | | | | am 2897fc4c: am fbb09347: am 5994bff9: Merge "One-time-only compatibility ↵Daniel Sandler2011-06-157-1/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode explanation dialog." into honeycomb-mr2 * commit '2897fc4cc320d9fea2c6a81d7e2b05b6b820acf0': One-time-only compatibility mode explanation dialog.
| * | | | | | | | | | | | | | | | | | am fbb09347: am 5994bff9: Merge "One-time-only compatibility mode ↵Daniel Sandler2011-06-157-1/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explanation dialog." into honeycomb-mr2 * commit 'fbb093479362865da833b89643a8f58347278bc3': One-time-only compatibility mode explanation dialog.
| | * | | | | | | | | | | | | | | | | am 5994bff9: Merge "One-time-only compatibility mode explanation dialog." ↵Daniel Sandler2011-06-157-1/+125
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '5994bff92472b3bdcd5754d8a9156b49269a9c1d': One-time-only compatibility mode explanation dialog.
| | | * | | | | | | | | | | | | | | | Merge "One-time-only compatibility mode explanation dialog." into honeycomb-mr2Daniel Sandler2011-06-157-1/+125
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | One-time-only compatibility mode explanation dialog.Daniel Sandler2011-06-157-1/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't miss it! Bug: 4595256 Change-Id: I80c0949e6118e3ea3af089d4cad160ce63e7d8ce
* | | | | | | | | | | | | | | | | | | | am d163a616: am 2fdf5880: am 97d5081a: Merge "Final UI for compatibility ↵Daniel Sandler2011-06-1522-40/+250
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode." into honeycomb-mr2 * commit 'd163a6162891f0e14d4536460d839262d2693e9a': Final UI for compatibility mode.
| * | | | | | | | | | | | | | | | | | | am 2fdf5880: am 97d5081a: Merge "Final UI for compatibility mode." into ↵Daniel Sandler2011-06-1522-40/+250
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '2fdf5880611c333e172d4e0cc2c4259bca324699': Final UI for compatibility mode.
| | * | | | | | | | | | | | | | | | | | am 97d5081a: Merge "Final UI for compatibility mode." into honeycomb-mr2Daniel Sandler2011-06-1522-40/+250
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97d5081ac331884fe0f6f2e5814d4862a974fbe3': Final UI for compatibility mode.
| | | * | | | | | | | | | | | | | | | | Merge "Final UI for compatibility mode." into honeycomb-mr2Daniel Sandler2011-06-1522-40/+250
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | Final UI for compatibility mode.Daniel Sandler2011-06-1522-40/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4595256 Change-Id: Idaa96393fb809c828b5f661f29e8b687fdf3d104
* | | | | | | | | | | | | | | | | | | | Merge "Fix a bug in TextToSpeech."Narayan Kamath2011-06-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix a bug in TextToSpeech.Narayan Kamath2011-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the requested engine is enabled. Change-Id: I8436b0b7b7f441fe3473601fb9c46181e90750e0
* | | | | | | | | | | | | | | | | | | | | Merge "Move WakeupTimer out of SipService."Hung-ying Tyan2011-06-152-311/+351
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Move WakeupTimer out of SipService.Hung-ying Tyan2011-06-142-311/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prepare to move keepalive process to SipSessionGroup before fixing the following bug. Bug: 3464181 Change-Id: I57d8f6effad76706b5a76e1269c53d558db88ae4
* | | | | | | | | | | | | | | | | | | | | Data usage warning and limit notifications.Jeff Sharkey2011-06-145-6/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Watch for network statistics to cross NetworkPolicy warning or limit, and show notifications to user as needed. Currently checks during any statistics update, but will eventually move to event registration through netd when kernel supports. Fixed accounting bug in getSummaryForNetwork(). Only apply UID policy to applications; applying to system processes could break critical services like RIL. Change-Id: Iac0f20e910e205f3cbc54ec96395ff268b1aa379
* | | | | | | | | | | | | | | | | | | | | Merge "Make FastScroller behave kinder and gentler when an app decides to ↵Adam Powell2011-06-141-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return null from SectionIndexer#getSections()"
| * | | | | | | | | | | | | | | | | | | | | Make FastScroller behave kinder and gentler when an app decides toAdam Powell2011-06-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return null from SectionIndexer#getSections() Change-Id: I9132073f149e13051db13d2e563bd7c1a316046e