Mike Lockwood
382087829a
Merge "ActivityManagerService: Disable app crashed dialog on headless builds" into ics-aah
2011-09-13 14:23:32 -07:00
Attila Bodis
05ae1f52d9
am e112f1c9: Merge "Adding isEmergencyNumber which also takes in a defaultCountryIso."
...
* commit 'e112f1c91c08a7df67926bf56810c1cb22f4fca7':
Adding isEmergencyNumber which also takes in a defaultCountryIso.
2011-09-13 14:22:04 -07:00
Mike Lockwood
1acfc1d48a
ActivityManagerService: Disable app crashed dialog on headless builds
...
Change-Id: Ife4bd7ea2d660feb4d630be2ca63e0403e953dde
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-13 17:21:46 -04:00
Attila Bodis
e112f1c91c
Merge "Adding isEmergencyNumber which also takes in a defaultCountryIso."
2011-09-13 14:20:32 -07:00
Dianne Hackborn
cda44ab452
am 3368a99f: Merge "Fix issue #4280324 : Returning to Fullscreen Layout with WebView..."
...
* commit '3368a99f3cc362d2d823f06a9b1e216696c41ea6':
Fix issue #4280324 : Returning to Fullscreen Layout with WebView...
2011-09-13 14:18:56 -07:00
Dianne Hackborn
3368a99f3c
Merge "Fix issue #4280324 : Returning to Fullscreen Layout with WebView..."
2011-09-13 14:16:59 -07:00
Jason Sams
6fb1261ead
am 96cbcbfe: Merge "Cleanup example code."
...
* commit '96cbcbfe176f3dc794fc9266c838ef71732e3e6c':
Cleanup example code.
2011-09-13 14:13:28 -07:00
Jason Sams
96cbcbfe17
Merge "Cleanup example code."
2011-09-13 14:11:11 -07:00
Jake Hamby
949848a6f4
am 0cc77088: Merge "Add method to retrieve MSISDN for CDMA/LTE devices."
...
* commit '0cc770888553872e49a96840deaa9f9694b76b51':
Add method to retrieve MSISDN for CDMA/LTE devices.
2011-09-13 13:52:01 -07:00
Jake Hamby
0cc7708885
Merge "Add method to retrieve MSISDN for CDMA/LTE devices."
2011-09-13 13:50:20 -07:00
Fabrice Di Meglio
e9dbef85d3
Fix bug #5282141 ScrollView overscroll should not generate invalidations when not needed (ANR textview redraws constantly when touched)
...
- check if the overscroll range is not 0
- check if we are in the correct overscroll mode
- also udpate HorizontalScrollView the same way
Change-Id: I0bb37f9813a5871eb856914786db5c06de59e4d3
2011-09-13 13:47:20 -07:00
Adam Powell
afb0905af5
am ac126be5: Merge "Fix bug 5226097 - App compatibility issues around new ListView fixes"
...
* commit 'ac126be503fb38068b25ed740ba183d8a0dd7858':
Fix bug 5226097 - App compatibility issues around new ListView fixes
2011-09-13 13:42:56 -07:00
Dianne Hackborn
782839125e
am b3db5b73: Merge "Fix issue #5309443 : Ninjump crashes on boot with..."
...
* commit 'b3db5b73a6ce3771ae914f132ae72cdb4ddbaa20':
Fix issue #5309443 : Ninjump crashes on boot with...
2011-09-13 13:40:55 -07:00
Adam Powell
ac126be503
Merge "Fix bug 5226097 - App compatibility issues around new ListView fixes"
2011-09-13 13:40:07 -07:00
Dianne Hackborn
b3db5b73a6
Merge "Fix issue #5309443 : Ninjump crashes on boot with..."
2011-09-13 13:38:17 -07:00
Mike Lockwood
5010bbda0f
Merge "Fix problems dispatching media button events on headless devices" into ics-aah
2011-09-13 13:32:14 -07:00
Mike Lockwood
1d29e2129f
Fix problems dispatching media button events on headless devices
...
Change-Id: Ib0f8ca008c7e1325d5dc6f6534f08960c527eeac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-13 16:29:38 -04:00
Dianne Hackborn
f809870f11
Fix issue #4280324 : Returning to Fullscreen Layout with WebView...
...
...Leads to Shifted Layout
Change-Id: I6cf3fd0dd066f73cd1ec6fce3d994f7e3eead293
2011-09-13 13:26:38 -07:00
Adam Powell
247a0f0a16
Fix bug 5226097 - App compatibility issues around new ListView fixes
...
Only dispatch change events when headers/footers change if we have an
adapter.
Change-Id: Ic5d68ea214196771d76f6a88186aaf5f8ed4c4cf
2011-09-13 13:11:29 -07:00
Eric Laurent
35bc00d36d
am 1fbe7a8e: Merge "Issue 4345021: Audio routed to multiple devices..."
...
* commit '1fbe7a8e828fd0fe8339d075da08aad701ab6e98':
Issue 4345021: Audio routed to multiple devices...
2011-09-13 12:59:45 -07:00
Eric Laurent
1fbe7a8e82
Merge "Issue 4345021: Audio routed to multiple devices..."
2011-09-13 12:57:37 -07:00
Eric Laurent
5f37be324f
Issue 4345021: Audio routed to multiple devices...
...
There is a possiblility that the condition on which RecordThread::checkForNewParameters_l()
waits after updating the command completion status is never signalled.
This happens if the thread executing ThreadBase::setParameters() has timed out waiting
for the status (for instance if the audio HAL takes too long to execute the setParameters()
command. Then the RecordThread is stuck forever.
The fix consists in waiting for the condition with a timeout in RecordThread::checkForNewParameters_l().
Change-Id: I7fc671bc2fc43ba4acb65a2beb33ee05742f091e
2011-09-13 12:44:22 -07:00
Dianne Hackborn
180c48489f
Fix issue #5309443 : Ninjump crashes on boot with...
...
...java.lang.IllegalArgumentException: Window type can not be
changed after the window is added
Change-Id: I4e34622c99d721fa214fd534a9bbfc8006184770
2011-09-13 12:39:25 -07:00
Gilles Debunne
37bcebbd9e
am 18b43119: Merge "Bug 5281947: add to dictionnary option promoted in suggestions."
...
* commit '18b43119229e5cd72952fdb71b7676de6e853c23':
Bug 5281947: add to dictionnary option promoted in suggestions.
2011-09-13 12:39:25 -07:00
Gilles Debunne
18b4311922
Merge "Bug 5281947: add to dictionnary option promoted in suggestions."
2011-09-13 12:38:03 -07:00
Mike Lockwood
eb6456b31e
Move Power Manager minimum screen brightness to a framework resource
...
Bug: 5279179
Change-Id: I445e78c774ad08be6582fa8870487a5210465a08
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-13 15:24:02 -04:00
Daniel Sandler
8cb6b8e954
am 52d27423: Merge "Transparent notification shade."
...
* commit '52d27423bf1435631ea4e9f5e0bd674669db823b':
Transparent notification shade.
2011-09-13 12:21:30 -07:00
Daniel Sandler
52d27423bf
Merge "Transparent notification shade."
2011-09-13 12:20:03 -07:00
Jake Hamby
5d39ec4a37
Add method to retrieve MSISDN for CDMA/LTE devices.
...
For CDMA/LTE devices, the MDN and MSISDN may be different.
Add a new method getMsisdn() to the Phone interface to return the
MSISDN. For GSM/UMTS, this will be the same as getLine1Number().
For CDMA/LTE, getLine1Number() will continue to return the MDN
and getMsisdn() will return the MSISDN.
Change-Id: Iba0ca24858992b21f63ae7ec0c27d2e90d4b0903
2011-09-13 11:58:08 -07:00
Daniel Sandler
9c00d5b8e7
When the status bar hides, close the notification panel.
...
Bug: 5087130
Change-Id: I8a63f424158faa3266f6904c0a57ac352a0555e4
2011-09-13 14:49:03 -04:00
Andreas Huber
e26f2ff0b6
am bf208ec9: Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks"
...
* commit 'bf208ec91ec80fd2a3c2474c236b09b37c1a02c4':
Support .avi tracks that have a sample size of 1, i.e. samples != chunks
2011-09-13 11:38:31 -07:00
Andreas Huber
bf208ec91e
Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks"
2011-09-13 11:37:22 -07:00
Jason Sams
53fc3e1867
Cleanup example code.
...
Change-Id: I060ea53c867ded0e6956776859fc2710c7302148
2011-09-13 11:29:02 -07:00
Costin Manolache
8d9750be71
am 5d42a7df: Merge "For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow"
...
* commit '5d42a7df1dffa5e7e4077e40348790e94411093d':
For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow
2011-09-13 11:23:02 -07:00
Costin Manolache
5d42a7df1d
Merge "For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow"
2011-09-13 11:21:16 -07:00
Andreas Huber
63749954aa
Support .avi tracks that have a sample size of 1, i.e. samples != chunks
...
Assume for now that all chunks are the same size, i.e. have the same number of
samples.
Change-Id: Ib8a7dfeb16cc3e5be199ff9d98b68dd0b9c23eb8
related-to-bug: 5279872
2011-09-13 11:12:57 -07:00
Chia-chi Yeh
5446e6b0de
am 7a685e89: Merge "SIP: fix keep-alive measurement and increase the timeout."
...
* commit '7a685e89114ddfe35f87075dfe66a480c91c9de2':
SIP: fix keep-alive measurement and increase the timeout.
2011-09-13 10:36:25 -07:00
Chia-chi Yeh
7a685e8911
Merge "SIP: fix keep-alive measurement and increase the timeout."
2011-09-13 10:35:04 -07:00
Andreas Huber
1949dce622
am fa6dfdcf: Don\'t post position updates too frequently
...
* commit 'fa6dfdcfd741980ba1c1d1971b69fc6f8a34dfeb':
Don't post position updates too frequently
2011-09-13 10:18:39 -07:00
Andreas Huber
fa6dfdcfd7
Don't post position updates too frequently
...
i.e. don't hog my message queue.
related-to-bug: 5284760
Change-Id: I8e2d36a11dbee1567b18ed13dc5257a65c6eeda7
2011-09-13 09:48:22 -07:00
Shaopeng Jia
9683f990a2
Adding isEmergencyNumber which also takes in a defaultCountryIso.
...
Also update CallerInfo and CallerInfoAsyncQuery to use the new method.
Bug: 5247602
Change-Id: I2bbb0806ad2787d53b19bc1e9bdfb0ee8be26980
2011-09-13 16:10:08 +02:00
Chia-chi Yeh
d17b6d5266
SIP: fix keep-alive measurement and increase the timeout.
...
Bug: 5226511
Change-Id: I1283790581496b1ff4e583a8d9379cdc39f78c20
2011-09-13 03:02:30 -07:00
Mathias Agopian
513d15aeef
am 62bb0cdc: Merge "improve sensorservice_test output"
...
* commit '62bb0cdc746e850c2d2d5da4f6c7a38f8782f4bc':
improve sensorservice_test output
2011-09-12 22:18:48 -07:00
Mathias Agopian
62bb0cdc74
Merge "improve sensorservice_test output"
2011-09-12 22:17:21 -07:00
Mathias Agopian
8c2733527a
improve sensorservice_test output
...
Change-Id: I6248b6f1f001fedec1bddcddfcd2b381d9bb4bf4
2011-09-12 22:16:01 -07:00
Daniel Sandler
49f5840734
Transparent notification shade.
...
Bug: 5270161 (fix opacity)
Bug: 5231194 (transparent shade)
Change-Id: Ib7130ef0718c092dc9f8149698625a49d7abb2b2
2011-09-13 00:35:52 -04:00
Daniel Sandler
a7eab3a6e2
am e168452a: Merge "Fix the takeoff position of a flung windowshade."
...
* commit 'e168452ad544ba8c5bdb1134c4629f91992611d7':
Fix the takeoff position of a flung windowshade.
2011-09-12 20:28:52 -07:00
Daniel Sandler
e168452ad5
Merge "Fix the takeoff position of a flung windowshade."
2011-09-12 20:26:52 -07:00
Adam Powell
8074d016f7
am 66d46f1d: Merge "Fix bug 5296851 - Silly monkeys."
...
* commit '66d46f1db8d37c60faca1a4e189ce0b4146bf5a6':
Fix bug 5296851 - Silly monkeys.
2011-09-12 19:21:41 -07:00
Adam Powell
66d46f1db8
Merge "Fix bug 5296851 - Silly monkeys."
2011-09-12 19:19:33 -07:00