Hung-ying Tyan
394d1e4bed
am afa583e6: SipAudioCall: expose startAudio()
...
Merge commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7' into gingerbread-plus-aosp
* commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7':
SipAudioCall: expose startAudio()
2010-09-17 01:01:07 -07:00
Hung-ying Tyan
1d1583573d
SipPhone: do not append SIP domain to PSTN number
...
in the CallerInfo so that only PSTN number is shown in the call log.
http://b/issue?id=2982632
Change-Id: I414f01d16ce64ecb8da7c6943ea7f080bcfd2794
2010-09-17 16:00:31 +08:00
Hung-ying Tyan
afa583e655
SipAudioCall: expose startAudio()
...
so that apps can start audio when time is right.
Change-Id: I7ae96689d3a8006b34097533bc2434bc3814b82a
2010-09-17 15:58:18 +08:00
Tadashi G. Takaoka
2c7ab0854e
am a79433cb: am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
...
Merge commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5'
* commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5':
Initialize Keyboard.Key attributes from parent Keyboard.Row
2010-09-17 00:05:52 -07:00
Tadashi G. Takaoka
a79433cb66
am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
...
Merge commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be' into gingerbread-plus-aosp
* commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be':
Initialize Keyboard.Key attributes from parent Keyboard.Row
2010-09-17 00:03:32 -07:00
Tadashi G. Takaoka
ecd43cca42
Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
2010-09-17 00:01:19 -07:00
Brian Carlstrom
f81174b281
am f3f822ed: am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread
...
Merge commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d'
* commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d':
Fix sim-eng build on Hardy
2010-09-16 23:54:39 -07:00
Brian Carlstrom
f3f822edc7
am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread
...
Merge commit '987ba54127caaaa87056965b3d98b7e1a5b110b7' into gingerbread-plus-aosp
* commit '987ba54127caaaa87056965b3d98b7e1a5b110b7':
Fix sim-eng build on Hardy
2010-09-16 23:51:31 -07:00
Brian Carlstrom
987ba54127
Merge "Fix sim-eng build on Hardy" into gingerbread
2010-09-16 23:48:53 -07:00
Hung-ying Tyan
6308514cbf
am 156edcc9: am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
...
Merge commit '156edcc9f64e010d6b6de97e9a77adfccee353eb'
* commit '156edcc9f64e010d6b6de97e9a77adfccee353eb':
Add timer to SIP session creation process.
2010-09-16 23:44:42 -07:00
Tadashi G. Takaoka
b65b7cb580
Initialize Keyboard.Key attributes from parent Keyboard.Row
...
Bug: 3009940
Change-Id: I22ef3e507c31e46b7581e20bcdd6b5ebc750adfe
2010-09-17 15:40:35 +09:00
Hung-ying Tyan
156edcc9f6
am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
...
Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp
* commit '9404e633a55cd325b57732cdd776053b3886b611':
Add timer to SIP session creation process.
2010-09-16 23:40:28 -07:00
Hung-ying Tyan
9404e633a5
Merge "Add timer to SIP session creation process." into gingerbread
2010-09-16 23:30:49 -07:00
Mathias Agopian
00030e9e70
am 876e0e56: am 36f429d3: Fix typo which causes sensors to fail miserably
...
Merge commit '876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1'
* commit '876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1':
Fix typo which causes sensors to fail miserably
2010-09-16 23:26:16 -07:00
Jake Hamby
14769a8690
am eb3b40af: am 0f584306: Fix Bluetooth Javadoc to clarify the maximum device name length.
...
Merge commit 'eb3b40af974d818cab66bf0a728c8bdec4f6f715'
* commit 'eb3b40af974d818cab66bf0a728c8bdec4f6f715':
Fix Bluetooth Javadoc to clarify the maximum device name length.
2010-09-16 23:25:59 -07:00
Hung-ying Tyan
9352cf1a4d
Add timer to SIP session creation process.
...
+ add timer parameter to ISipSession.make/changeCall(),
+ add timer paramter to SipAudioCall.make/answer/hold/continueCall()'s,
+ add timer parameter to SipManager.makeAudioCall(),
+ modify implementation in SipSessionGroup, SipAudioCallImpl accordingly,
+ make SipPhone to use it with 8-second timeout.
http://b/issue?id=2994748
Change-Id: I661a887e5810087ddc5e2318335e2fa427f80ec6
2010-09-17 13:31:05 +08:00
Mathias Agopian
876e0e5646
am 36f429d3: Fix typo which causes sensors to fail miserably
...
Merge commit '36f429d300be2550d7459b488dfc05b00ec59312' into gingerbread-plus-aosp
* commit '36f429d300be2550d7459b488dfc05b00ec59312':
Fix typo which causes sensors to fail miserably
2010-09-16 22:16:02 -07:00
Jake Hamby
eb3b40af97
am 0f584306: Fix Bluetooth Javadoc to clarify the maximum device name length.
...
Merge commit '0f5843069bd419fba4fb253986645dfbca0784b7' into gingerbread-plus-aosp
* commit '0f5843069bd419fba4fb253986645dfbca0784b7':
Fix Bluetooth Javadoc to clarify the maximum device name length.
2010-09-16 22:15:55 -07:00
Mathias Agopian
36f429d300
Fix typo which causes sensors to fail miserably
...
Change-Id: Ieca18fc089e2bdf7d049f213836971b54d11cd76
2010-09-16 21:41:13 -07:00
Wink Saville
00cfe112b4
Add LinkSocket API
...
Restructuring ConnectivityService to handle multiple connections.
Change-Id: Ia993fbb120bebb844fd0d603dc76fbc700b31fd1
2010-09-16 21:27:39 -07:00
Wink Saville
f61101f626
Add LinkCapabilities
...
Change-Id: Ia1599ade936b79f12526252c0a2e6b453abb136e
2010-09-16 21:26:59 -07:00
Romain Guy
a977120681
Merge "Add support for drawLines(), with anti-aliasing"
2010-09-16 20:51:45 -07:00
Romain Guy
759ea80dca
Add support for drawLines(), with anti-aliasing
...
Change-Id: I16c0593c5671490909dec13a85df601e1428a1a6
2010-09-16 20:49:46 -07:00
Adam Cohen
ca6fd84794
Modifying API for setting on-click intents for items
...
in widget collections.
Change-Id: I0ad1f1241b7a40f0790ecd9fd3228f204d2c8499
2010-09-16 19:24:20 -07:00
Adam Cohen
227e686878
Merge "Adding some documentation to Matrix.mapVectors methods."
2010-09-16 18:59:08 -07:00
Jeff Brown
a1361e48fa
Looper: Drop default parameters in favor of a safer overload.
...
The idea is that if you're writing code that wants fd/events/data on
return from pollOnce() / pollAll() you should really pass in all of those
arguments. When I changed the Looper API earlier, it was difficult
to ensure that all callers were passing the right parameters since they
were relying on default parameters to some degree so usage mistakes
would not have been caught by the compiler.
Change-Id: I1f2812894270aaf1515017ac1616b6b312d9b565
2010-09-16 18:51:15 -07:00
Dianne Hackborn
c6669ca632
Add API for showing breadcrumbs of fragment back stack.
...
This adds a simple API to have your back stack automatically
shown as bread crumbs in the action bar. Introduces some APIs
to retrieve the current back stack.
Also fix a little bug in the "activated" state where it was
being propagated down the hierarchy as "selected". :p And from
that, fix the standard colors to be reasonable when in the
activated state.
Finally PreferenceActivity is updated to take advantage of
bread crumbs to show your place in the preferences.
Change-Id: I9d633bedf8d7c6e4ed9b25cb9698faa66c7dd9a4
2010-09-16 18:36:04 -07:00
Mathias Agopian
10a96daf7f
am 793b2293: am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread
...
Merge commit '793b2293797ea930078640c4827d3cbdf449c227'
* commit '793b2293797ea930078640c4827d3cbdf449c227':
surfaceflinger / GL extensions cleanup
2010-09-16 18:26:19 -07:00
Mathias Agopian
99ce457320
am 8f476407: am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
...
Merge commit '8f476407bf4e6283b128532d594d44cc527e8204'
* commit '8f476407bf4e6283b128532d594d44cc527e8204':
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
2010-09-16 18:26:13 -07:00
Mathias Agopian
7bb3e78ff3
am 3a35f078: am 079ed615: Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
...
Merge commit '3a35f078e75cd3f63e57b0fffbac486e12a0a933'
* commit '3a35f078e75cd3f63e57b0fffbac486e12a0a933':
fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
2010-09-16 18:26:09 -07:00
Jesse Wilson
2f6d37c2b5
Merge "resolved conflicts for merge of d78f338e to master"
2010-09-16 18:22:59 -07:00
Jason Sams
4ffde2b041
Merge "Cleanup GL setup code and remove legacy 1.1 paths. Reset pointers to NULL when allocations are unbound."
2010-09-16 18:21:29 -07:00
Jesse Wilson
98a6abf7e3
resolved conflicts for merge of d78f338e to master
...
Change-Id: Ibe4be94126df9f1ea999b0396351886161552960
2010-09-16 18:21:20 -07:00
Jake Hamby
0f5843069b
Fix Bluetooth Javadoc to clarify the maximum device name length.
...
The maximum length of a Bluetooth device name is 248 bytes using
UTF-8 encoding. Updated the Javadoc to clarify that the length is
limited by the number of UTF-8 bytes and not the number of characters.
Change-Id: I135671f5ee6c5eb6372f3fbbc5fccb02de65e6c4
2010-09-16 18:21:07 -07:00
Jason Sams
d081fffab5
Cleanup GL setup code and remove legacy 1.1 paths.
...
Reset pointers to NULL when allocations are unbound.
Change-Id: Ifaba634ecbb154970b7fb47faa8e6475d16d2f66
2010-09-16 18:18:29 -07:00
Jason Sams
f8438a7db0
Merge "Fix race condition on exit."
2010-09-16 18:10:41 -07:00
Mathias Agopian
793b229379
am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread
...
Merge commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp
* commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69':
surfaceflinger / GL extensions cleanup
2010-09-16 17:57:34 -07:00
Mathias Agopian
8f476407bf
am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
...
Merge commit '08710dcd589432c5828cefce25e4b565b15de9a6' into gingerbread-plus-aosp
* commit '08710dcd589432c5828cefce25e4b565b15de9a6':
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
2010-09-16 17:57:29 -07:00
Mathias Agopian
3a35f078e7
am 079ed615: Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
...
Merge commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34' into gingerbread-plus-aosp
* commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34':
fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
2010-09-16 17:57:25 -07:00
Mathias Agopian
1bcb8b1afb
Merge "surfaceflinger / GL extensions cleanup" into gingerbread
2010-09-16 17:55:05 -07:00
Jesse Wilson
d78f338e26
am 14836fb1: Merge "Add optional tags to frameworks/base ext." into gingerbread
...
Merge commit '14836fb17335b147ebc8081fea11fda0d46ce532' into gingerbread-plus-aosp
* commit '14836fb17335b147ebc8081fea11fda0d46ce532':
Add optional tags to frameworks/base ext.
2010-09-16 17:54:55 -07:00
Mathias Agopian
08710dcd58
Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work" into gingerbread
2010-09-16 17:54:50 -07:00
Mathias Agopian
079ed61579
Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
2010-09-16 17:54:42 -07:00
Jesse Wilson
14836fb173
Merge "Add optional tags to frameworks/base ext." into gingerbread
2010-09-16 17:52:29 -07:00
Jesse Wilson
a145956551
Add optional tags to frameworks/base ext.
...
Change-Id: I08a69b7ca783994e52f735ad0ee9b85197cdaa96
2010-09-16 17:50:43 -07:00
Mathias Agopian
4d3cb63b9b
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
...
- In SensorEventQueue, only bail on errors from Looper::loopOnce
- Improve sensor error logging
Change-Id: Ib3cf8d5d9fdac8513a3d753155827e0feeda1662
2010-09-16 17:33:48 -07:00
Jeff Brown
ec8ae3ce1a
am d3576ef8: am 1ac48eab: Merge "Ensure input dispatcher and native looper handles EINTR." into gingerbread
...
Merge commit 'd3576ef8906798d91da3ee88a103f4bedcab169e'
* commit 'd3576ef8906798d91da3ee88a103f4bedcab169e':
Ensure input dispatcher and native looper handles EINTR.
2010-09-16 17:29:57 -07:00
Jeff Brown
711f82784f
am 6f0ff46c: am 9c258710: Merge "Fix app switch latency optimization." into gingerbread
...
Merge commit '6f0ff46c6f1fd1b61325b545ab9e93c5ebf37d25'
* commit '6f0ff46c6f1fd1b61325b545ab9e93c5ebf37d25':
Fix app switch latency optimization.
2010-09-16 17:29:46 -07:00
Carl Shapiro
3bf23a7b9f
am b0abf3ea: am 4b164c1b: Kill off the remaining GC-specific system properties.
...
Merge commit 'b0abf3ea47b74296fd790843e789cfd101f58a00'
* commit 'b0abf3ea47b74296fd790843e789cfd101f58a00':
Kill off the remaining GC-specific system properties.
2010-09-16 17:29:41 -07:00
Andreas Huber
09a985187a
am 92aa28ad: am a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread
...
Merge commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9'
* commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
2010-09-16 17:29:30 -07:00