31172 Commits

Author SHA1 Message Date
Vasu Nori
9a68713ca0 Merge "sql statement with syntax errors can leave database lock in bad state" 2010-09-14 10:04:13 -07:00
Hung-ying Tyan
188a8f1b72 am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp

* commit '89a7180a242043a0b4d6695bf386c93365bf6797':
  SipService: ignore connect event for non-active networks.
2010-09-14 10:00:14 -07:00
Hung-ying Tyan
89a7180a24 Merge "SipService: ignore connect event for non-active networks." into gingerbread 2010-09-14 09:57:47 -07:00
Eric Laurent
d09af7d551 Added intents for audio effects control application
Added intents to launch audio effects control panel UI and
communicate playback state from media player applications
to effect control application/service.

Change-Id: Iede23ae11fa9f0802df5f36299dd80ea57eda376
2010-09-14 09:55:30 -07:00
Alex Sakhartchouk
c984dd73c6 Shader changes to allow for more flexible constant binding.
Change-Id: Ic66e6e2a371c6e3d5dce1b00f63acab8c09bd110
2010-09-14 09:50:43 -07:00
Hung-ying Tyan
12bec5ddf5 SipService: ignore connect event for non-active networks.
+ sanity check and remove redundant code.

Change-Id: I4d3e226851ad7fc4d88ddcd0a5c58f7e33b6c14a
2010-09-15 00:49:02 +08:00
Dirk Dougherty
f9c7a3e25e am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit 'e71396cf4704ee9e26f510b511c1e793d8048d83' into gingerbread-plus-aosp

* commit 'e71396cf4704ee9e26f510b511c1e793d8048d83':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:46:44 -07:00
Kenny Root
3ca2691446 am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp

* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
  Dedupe timestamp in PackageSettings
2010-09-14 09:46:40 -07:00
Hung-ying Tyan
ae83faa3ee am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()
Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp

* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
  SipAudioCall: use SipErrorCode instead of string in onError()
2010-09-14 09:44:03 -07:00
Hung-ying Tyan
3692af92ab am 99bf4e45: SIP: remove dependency on javax.sip
Merge commit '99bf4e45c4566172189735b34b368b76660ca57a' into gingerbread-plus-aosp

* commit '99bf4e45c4566172189735b34b368b76660ca57a':
  SIP: remove dependency on javax.sip
2010-09-14 09:43:54 -07:00
Chung-yih Wang
316e72cb05 am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
Merge commit '5dde95b8fe0fea1a115a68f8acf826371da89da7' into gingerbread-plus-aosp

* commit '5dde95b8fe0fea1a115a68f8acf826371da89da7':
  Fix the bug of authentication in an outgoing call.
2010-09-14 09:43:46 -07:00
Jaikumar Ganesh
b390728b54 am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp

* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
  Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-14 09:43:31 -07:00
Hung-ying Tyan
ca83c25dec am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp

* commit '4565933f03a99750a333e97e95408c404984510f':
  SipService: deliver connectivity change to all sessions.
2010-09-14 09:43:17 -07:00
Dirk Dougherty
e71396cf47 am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread

* commit '4b4af990af527c79073d546ead1850278caa7a8e':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:39:59 -07:00
Kenny Root
3043441511 Merge "Dedupe timestamp in PackageSettings" into gingerbread 2010-09-14 09:29:48 -07:00
Dirk Dougherty
4b4af990af Doc change: update ADT 0.9.8 checksum and size.
Change-Id: I610985683cd4608b075a22e8d8089de7896eb312
2010-09-14 09:17:33 -07:00
Steve Block
757dcbb803 Implement LayoutTestController.setAppCacheMaximumSize() for DumpRenderTree2
Change-Id: I7db486ccee1b9ebe84b89b98ba1a9b6e933d8f4e
2010-09-14 16:59:17 +01:00
Steve Block
8a0db6f5ff Merge "Sort LayoutTestController methods alphabetically" 2010-09-14 08:25:26 -07:00
Brad Fitzpatrick
50d66f9fcd Unify some duplicate StrictMode-enabling code.
Change-Id: Ifb92f35d9e245dbdb5e201597d8be702bce9e8b8
2010-09-14 08:22:30 -07:00
Maksymilian Osowski
2e36737669 Made the run_layout_tests.py script restart the apache2 server before it starts.
Change-Id: Ic6b4e63d20a95daddd3dfde32d4168b235d7dd91
2010-09-14 16:09:11 +01:00
Mike Lockwood
05f5a78df6 Merge changes I28b846a3,Ifd9b48cb
* changes:
  MediaScanner: Fix problems with scanner non-file objects from the database
  MTP: Delete all files and subdirectories when deleting directories.
2010-09-14 08:05:29 -07:00
Leon Scroggins III
4a02800946 Add an option to hide the Voice Search icon.
Some search engines do not support voice search, so provide a flag
to disable showing the icon in the SearchDialog.

Change-Id: I7ef4ad5d382edb86c08014260defa4af6d5eca0a
2010-09-14 10:56:25 -04:00
Mike Lockwood
d7456c650e MediaScanner: Fix problems with scanner non-file objects from the database
Abstract objects should not be garbage collected and directories should be
removed only if they no longer exist in the file system.

Change-Id: I28b846a39324a7c2968357917089cd4c1238a014
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-14 10:44:30 -04:00
Mike Lockwood
ccb6e96194 MTP: Delete all files and subdirectories when deleting directories.
Children are now recursively deleted from the database and filesystem.

Change-Id: Ifd9b48cbc34b84b8f5073f2493dfe9735fae5492
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-14 10:37:27 -04:00
Steve Block
5de8b998f5 Sort LayoutTestController methods alphabetically
This makes it easier to keep trac of which methods are implemented.
No functional changes.

Change-Id: I389ec5c0f7e77def6a479e387d1373b2b87f60c2
2010-09-14 14:44:29 +01:00
Hung-ying Tyan
13f6270eb1 SipAudioCall: use SipErrorCode instead of string in onError()
and fix callback in setListener().

Change-Id: Ic2622df992a2ad45cb1e3f71736f320897ae8fb3
2010-09-14 21:36:10 +08:00
Steve Block
540aada302 Merge "Add to DumpRenderTree2 the option to suppress showing results in the host browser" 2010-09-14 06:27:08 -07:00
Steve Block
d210fd26b2 Add to DumpRenderTree2 the option to suppress showing results in the host browser
Change-Id: I78841ab5fad4e3ee0d5fe559489bf8cfd81abd23
2010-09-14 14:24:59 +01:00
Maksymilian Osowski
59e46ef785 Merge "Gets rid of flickering when executing tests." 2010-09-14 06:24:08 -07:00
Maksymilian Osowski
a7e2ca9a1c Gets rid of flickering when executing tests.
Achieves it by setting Executor background to white.

Change-Id: Id07c743114c6cce9e9446439136a5efd72857dc4
2010-09-14 14:23:07 +01:00
Hung-ying Tyan
99bf4e45c4 SIP: remove dependency on javax.sip
and change errorCodeString to errorCode in
SipRegistrationListener.onRegistrationFailed().

Change-Id: Id9618f5a4b0effaed04f8b0dc60347499d9e4501
2010-09-14 20:29:02 +08:00
Jeff Brown
4fe6c3e51b Replace epoll() with poll() and rename PollLoop to Looper.
As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).

Removed the dependence on specific constants from sys/poll.h such as
POLLIN.  Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports.  That should help make any future
under-the-hood implementation changes easier.

Fixed a couple of compiler warnings along the way.

Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
2010-09-14 01:59:45 -07:00
Brian Carlstrom
2c42c8fbaf Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
Bug: 2672817

Change-Id: If5f10fa16eaf5676a0c1540463759cd4e0e837de
2010-09-14 00:11:14 -07:00
Chung-yih Wang
5dde95b8fe Merge "Fix the bug of authentication in an outgoing call." into gingerbread 2010-09-13 23:31:18 -07:00
Chung-yih Wang
7d137e40cd Fix the bug of authentication in an outgoing call.
Since we missed the check of another challenge header in the
proxy authentication response.

Change-Id: Ie5b9d22c6c55b4d65619d2194c88845e7dd59f15
2010-09-14 14:17:02 +08:00
Mathias Agopian
04262e9f84 Add logging of various important graphics events
There are 16 events logged in the event log:
SF_APP_DEQUEUE_BEFORE
SF_APP_DEQUEUE_AFTER
SF_APP_LOCK_BEFORE
SF_APP_LOCK_AFTER
SF_APP_QUEUE

SF_REPAINT
SF_COMPOSITION_COMPLETE
SF_UNLOCK_CLIENTS
SF_SWAP_BUFFERS
SF_REPAINT_DONE

SF_FB_POST_BEFORE
SF_FB_POST_AFTER
SF_FB_DEQUEUE_BEFORE
SF_FB_DEQUEUE_AFTER
SF_FB_LOCK_BEFORE
SF_FB_LOCK_AFTER

all events log the buffer conserned and a timestamp in microseconds.

by default the logging is not enabled, to turn it on:
adb shell service call SurfaceFlinger 1006 i31 1
adb shell setprop debug.graphic_log 1

The effect is immediate in SurfaceFlinger, but applications need to be
restarted.

Change-Id: Ifc2e31f7aed072d9a7dede20ff2ce59231edbec1
2010-09-13 23:16:58 -07:00
Dianne Hackborn
a21e3da559 Fix issue #2967969: Crash rotating screen on "delete account" dialog
- Have PreferenceActivity save and restore its header state.
- Keep track of the current header selection.
- When headers are updated, try to retain the current header selection.

Also fix issue #2995541: Cannot add new contact.  We were not allowing
fragment transactions in some cases.

Change-Id: I4aa4c703ed5f4ecf9f425cd7eeea4740c6360ce9
2010-09-13 22:49:54 -07:00
Jaikumar Ganesh
a224f70b1e Fix interaction between BluetoothEventLoop and BluetoothService.
BluetoothEventLoop primarily handles event notifications from Bluez.
It should know innards of Bonding and especially BondState.
BondState class and BluetoothService call into each other.
When BluetoothEvent loop gets the handle to BondState it leads
to deadlocks and ANRs.

Change-Id: I785c57f6246c1288350d26d4acb87d879b27a5f9
2010-09-13 21:58:10 -07:00
Dianne Hackborn
ade9916d5c resolved conflicts for merge of 6421ae7e to master
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
2010-09-13 21:41:57 -07:00
Hung-ying Tyan
4565933f03 Merge "SipService: deliver connectivity change to all sessions." into gingerbread 2010-09-13 19:53:58 -07:00
John Wang
bc0e400d78 Return immutable copies of private callList.
Change-Id: I3da97acf89e044515e98fa04233dd378c32c250d
2010-09-13 19:10:21 -07:00
Dianne Hackborn
f86369ad0a am 527c0283: am a0eb56ac: Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread
Merge commit '527c02838bed1188b9211752b4cf2fc0c03e8202'

* commit '527c02838bed1188b9211752b4cf2fc0c03e8202':
  Work on issue #2991868: A toast pops up informing users...
2010-09-13 18:58:20 -07:00
Adam Powell
5f12084daa Merge "Fix bug 2995805 - splitMotionEvents behavior change" 2010-09-13 18:18:47 -07:00
Romain Guy
87a76578f7 Docs updates.
Change-Id: Iff395e1c6d81a484a2c4ad6e88357c0134971b78
2010-09-13 18:13:52 -07:00
Adam Powell
167bc821dd Fix bug 2995805 - splitMotionEvents behavior change
Changed the new split motion events behavior to match the enshrined
behavior. A return value of false from a target's dispatchTouchEvent
will not prevent the target from receiving further events in the
gesture unless it is the initial ACTION_DOWN event.

Change-Id: Ied8d531dfec7009a4124ed670b1700753c3f9caa
2010-09-13 18:11:08 -07:00
Romain Guy
e8c1c539ca Merge "Document the implementation of saveLayer()." 2010-09-13 18:04:18 -07:00
Romain Guy
1c740bce8a Document the implementation of saveLayer().
The implementation is simple but tricky. Leave explanations to my
future self so that I don't invent a time machine to come back to
now and slap my self.

This change also simplifies the way the GL blending function is
chosen when compositing a layer. It reuses existing OpenGLRenderer
APIs and is easier to understand.

Change-Id: I1b9cf8c5d51e09836d85b8cf157a1c284aa65c59
2010-09-13 18:03:21 -07:00
Romain Guy
82e73f23c4 Merge "Forgot the return value..." 2010-09-13 17:32:58 -07:00
Romain Guy
81ab046a11 Forgot the return value...
Change-Id: Iccf369a613c1cf83f3e948460c567291b084fad2
2010-09-13 17:32:34 -07:00
Romain Guy
dee94fa957 Merge "Fix rendering issue with layers intersecting the clip rect." 2010-09-13 17:29:08 -07:00