Brian Carlstrom
405d4db50b
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
...
Bug: 2672817
Change-Id: Ibe20830f024f76232f3628cfca922d49a5a06bef
2010-09-14 11:24:13 -07:00
Brian Carlstrom
0535d8577f
am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
...
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp
* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Erik
71ad58c751
Adds time zone functionality into fw as a hidden api
...
This is the start of work towards pushing api that is needed for
Calendar to become unbundled into frameworks. This adds functions
for getting and setting time zones for the Calendar app. The new
methods are currently hidden.
Change-Id: I1b4265b23630c46d9730a179ec02da8d6c0e03ea
2010-09-14 11:16:08 -07:00
Brian Carlstrom
9412623842
Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
2010-09-14 11:15:01 -07:00
jsh
2ec0e6fe1e
Unhide GsmCellLocation.getPsc().
...
bug: 2465036
Change-Id: If071c4e0f1f3484c010ec908b02800361cbf8a86
2010-09-14 11:13:27 -07:00
Dianne Hackborn
70be1673ab
Fix problem where power manager was calling battery stats with bad wl type.
...
Also fiddle code to reduce duplication.
Change-Id: I3f1b086e53ef88dac1ec1896fe711b3cfe7fdd58
2010-09-14 11:13:03 -07:00
Amith Yamasani
9322775014
Add a missing setOnCloseListener and a new setIconfied method.
...
Keep track of the currently iconified state as well, if the app
wants to know.
2010-09-14 10:55:10 -07:00
Maksymilian Osowski
023606abb6
Merge "Changed Summarizer to add header before printing the path in summary.txt and details.html"
2010-09-14 10:37:46 -07:00
John Wang
e92fdd261e
am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
...
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp
* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
Return immutable copies of private callList.
2010-09-14 10:31:45 -07:00
John Wang
e7b92d7b53
Merge "Return immutable copies of private callList." into gingerbread
2010-09-14 10:28:33 -07:00
Leon Scroggins III
720d5985f5
am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp
* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
Add an option to hide the Voice Search icon.
2010-09-14 10:26:44 -07:00
Leon Scroggins III
901b7b9b17
am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread
* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
Add an option to hide the Voice Search icon.
2010-09-14 10:23:35 -07:00
Steve Block
8a2e55239a
Merge "Implement LayoutTestController.setAppCacheMaximumSize() for DumpRenderTree2"
2010-09-14 10:21:30 -07:00
Leon Scroggins III
ca8f3d0428
Merge "Add an option to hide the Voice Search icon." into froyo
2010-09-14 10:21:25 -07:00
Maksymilian Osowski
75aa0d3828
Changed Summarizer to add header before printing the path in summary.txt and details.html
...
Change-Id: I6413e1871ede077793d49b7d4732f90d0aea352f
2010-09-14 18:13:07 +01:00
Maksymilian Osowski
ac0b599fa7
Merge "Made the run_layout_tests.py script restart the apache2 server before it starts."
2010-09-14 10:04:23 -07:00
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