Andreas Huber
7c6153606c
Fail to parse duration instead of asserting, if the server response cannot be parsed.
...
Change-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf
related-to-bug: 3338518
2011-01-12 09:57:23 -08:00
James Dong
31d8a03e44
Speed up MP3Extractor using cached reads
...
Change-Id: I53a5ed76bc2f76f0c184f3800b5448f677117ae3
2011-01-12 09:49:15 -08:00
Mike Lockwood
1c4e88d0b0
Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
...
This rips out some complicated code that was added since gingerbread
that is no longer necessary.
Change-Id: Iab5ecb7314c06221475ce01ef483f34f17003b06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-12 12:48:13 -05:00
Mike Lockwood
35a2ea2fbf
Remove permission android.permission.WRITE_MEDIA_STORAGE
...
Access to the /data/media directory is now restricted exclusively to the
sdcard daemon, so there is no longer a need for this permission.
Change-Id: Iea8400f0eee167df19cc231c502d251a364f98b3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-12 12:48:13 -05:00
Patrick Scott
b3b7197cd4
am 92a9a3c5: Merge "Do not merge." into honeycomb
...
* commit '92a9a3c5ef9774863b4cee93d43b67582a02c2f0':
Do not merge.
2011-01-12 09:47:09 -08:00
Patrick Scott
92a9a3c5ef
Merge "Do not merge." into honeycomb
2011-01-12 09:44:59 -08:00
Patrick Scott
d1737edc13
Do not merge.
...
Cherry picked:
Add an api to toggle content url access.
By default, WebView allows access to content providers on the system. This
setting allows applications to turn off content urls.
Bug: 1196879
Change-Id: I49eaea6d7b9ccc3b3a4443d712222556087568c0
2011-01-12 12:42:51 -05:00
Glenn Kasten
5ac80dde04
am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
...
* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
Fix race in buffer ref counting.
2011-01-12 09:36:00 -08:00
Glenn Kasten
e5cf7f2bc5
Merge "Fix race in buffer ref counting." into honeycomb
2011-01-12 09:34:37 -08:00
Glenn Kasten
4e26bc686b
Fix race in buffer ref counting.
...
Change-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6
2011-01-12 09:22:07 -08:00
Cary Clark
45c674304e
am 688b0af6: Merge "add null check to copy selection" into honeycomb
...
* commit '688b0af6a888a8a427d9a4c82fedf3e345e6ae34':
add null check to copy selection
2011-01-12 08:21:03 -08:00
Cary Clark
688b0af6a8
Merge "add null check to copy selection" into honeycomb
2011-01-12 08:19:24 -08:00
Chet Haase
efcceb856a
New interpolator resources now found in interpolator/ directory
...
Change-Id: Ib08200d71fce1706a0c683df104f0ff3d777ca17
2011-01-12 07:41:31 -08:00
Robert Greenwalt
1ea7e5df91
am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
...
* commit 'a78e9f055834030ebe25480004f667f4bca35232':
Fix any_connection reporting.
2011-01-12 07:19:05 -08:00
Robert Greenwalt
a78e9f0558
Merge "Fix any_connection reporting." into honeycomb
2011-01-12 07:16:56 -08:00
Cary Clark
7170bb6391
add null check to copy selection
...
This prevents a toast from appearing
if copyselection is done initially.
bug:3339016
Change-Id: If6f91b8f3794b3807fb3319fc542838abd431c64
2011-01-12 10:12:15 -05:00
Kristian Monsen
3ede315d65
Add a static method to get the InputStream of a content URL
...
Part of fix for bug 2862096
Change-Id: I91f7e7aa1f0fef10b1617e91a167594d4de41b71
2011-01-12 11:53:28 +00:00
Kristian Monsen
80ff5d82bd
Adding a static method to get the size of a content url
...
Part of fixes for bug 2862096
Change-Id: I86f1255c17efb367fac54b69b8de220d2874fc70
2011-01-12 10:21:17 +00:00
satok
52b1826568
am 31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
...
* commit '31d9d895d79977fa4e6dff2491b209fbeb21c61b':
Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
2011-01-12 01:20:24 -08:00
satok
31d9d895d7
Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
2011-01-12 01:17:58 -08:00
Brad Fitzpatrick
43194ce05e
am 52d70722: am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
...
* commit '52d70722654548d156bd7a1cb8c1f05b94b09f06':
Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-12 00:04:27 -08:00
Dianne Hackborn
5eefd98aa3
am a9d8a69a: am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
...
* commit 'a9d8a69a044c8e0c2d3268ed98bd17063faaeb1e':
Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-12 00:04:18 -08:00
Chris Tate
ba96a561e2
am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
...
* commit '69f8d3c667669dc1858c21ee798c0f836f53235e':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-12 00:04:12 -08:00
Chris Tate
46af781a1c
am 9b1bd2c7: (-s ours) am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
...
* commit '9b1bd2c7d1acffa1079d589811450140518e5ce5':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-12 00:04:04 -08:00
Dianne Hackborn
b0735d86c7
am 412ebd6f: am 433863b1: Fix issue #3333958 : Package Manager can sometimes mistakenly think...
...
* commit '412ebd6f9d18eebc11d8473318316aef1dfc5caa':
Fix issue #3333958 : Package Manager can sometimes mistakenly think...
2011-01-12 00:03:53 -08:00
Dianne Hackborn
248528cc89
am 95db1cfc: am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
...
* commit '95db1cfc741c23c7f4192128e3b7bb3c43761bdb':
2011-01-12 00:03:45 -08:00
Wei-Ta Chen
2cd221c929
am 4b9adfbe: Merge "Correct the API comments." into honeycomb
...
* commit '4b9adfbe7d0cf578b82eb7794c506ad1986854b9':
Correct the API comments.
2011-01-11 23:18:29 -08:00
satok
3da922367c
Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
...
Bug: 3329578
Change-Id: Ib45ca20560c96faa6e2798242f3d1c3fe5156457
2011-01-12 16:17:46 +09:00
Wei-Ta Chen
4b9adfbe7d
Merge "Correct the API comments." into honeycomb
2011-01-11 23:16:15 -08:00
Wei-Ta Chen
96d3b5e383
Correct the API comments.
...
BitmapRegionDecoder supports PNG as well.
Change-Id: I5f1b95c20c3ae87738f9814cfc16d6a4c5af2bf5
2011-01-11 23:06:56 -08:00
Svetoslav Ganov
d753aea1ad
am 2ad2bf23: Merge "Renaming NumberPicker resources to be consistent." into honeycomb
...
* commit '2ad2bf232714009586c5163e08754886bdd9ea20':
Renaming NumberPicker resources to be consistent.
2011-01-11 21:58:22 -08:00
Svetoslav Ganov
2ad2bf2327
Merge "Renaming NumberPicker resources to be consistent." into honeycomb
2011-01-11 21:56:03 -08:00
Jim Miller
39d4b067a7
Fix 3201849: Use custom Drawable for bg in lockscreen
...
This uses a custom drawable to improve the performance of
rendering a transparent background in LockScreen on devices
without hardware acceleration.
Change-Id: I7aae13070d475c3ac19d91ba5c6cb7d2a83a18ce
2011-01-11 20:30:20 -08:00
Christopher Tate
771fcc5e3d
am 28514f8f: Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
...
* commit '28514f8f9cdac95799d5654a30fe36ef05443dd3':
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
2011-01-11 20:03:57 -08:00
Christopher Tate
28514f8f9c
Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
2011-01-11 20:02:35 -08:00
Chung-yih Wang
15f8d75f51
am 8df7b060: Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
...
* commit '8df7b060fa8d3eb6d9874af01f2d189d0ceb74d7':
Merge "Add auth. username in SipProfile." from gingerbread.
2011-01-11 19:49:34 -08:00
Chung-yih Wang
8df7b060fa
Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
2011-01-11 19:47:48 -08:00
Chung-yih Wang
0f7de88cb9
Merge "Add auth. username in SipProfile." from gingerbread.
...
bug:3326867
Change-Id: Ic67dd7d4858f28224e4f01ad8b65bcd3a3c15f10
2011-01-12 11:43:27 +08:00
Romain Guy
af62958690
am 9688fdf5: am fcf3d12d: Merge "Typo in Javadoc"
...
* commit '9688fdf51edb82a73e1a6d436bf7bce706c049fb':
Typo in Javadoc
2011-01-11 19:34:38 -08:00
Stephen Hines
445fc56682
am 78dd1ef3: Merge "Clean up RS math headers." into honeycomb
...
* commit '78dd1ef3f70ff80bf9697ba53601bda48451c044':
Clean up RS math headers.
2011-01-11 19:12:23 -08:00
Stephen Hines
78dd1ef3f7
Merge "Clean up RS math headers." into honeycomb
2011-01-11 19:09:47 -08:00
Robert Greenwalt
f21ef7db77
Fix any_connection reporting.
...
A recent change caused us to think there was no other connection available
when transitioning from 3g to wifi.
bug:3335074
Change-Id: I1f55df8a0eb5b27131572b111fbaac8f1ebbc0d3
2011-01-11 18:32:17 -08:00
Christopher Tate
02d2b3ba9b
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
...
There will be, in the future, a flag (View.DRAG_FLAG_GLOBAL) that means
for the drag to be cross-application. For now that flag constant is @hide
and furthermore the server-side implementation strips it, enforcing
local-only drags.
Change-Id: I8db840480ab90e18a5b8ecf29d62b4e6eafd405e
2011-01-11 18:30:23 -08:00
Svetoslav Ganov
2b6f5210ec
am 5220834c: Merge "Down arrow on the month can end up at the start of the month" into honeycomb
...
* commit '5220834c6ccdabf949dfe7160548ad378850d71b':
Down arrow on the month can end up at the start of the month
2011-01-11 18:06:46 -08:00
Svetoslav Ganov
5220834c6c
Merge "Down arrow on the month can end up at the start of the month" into honeycomb
2011-01-11 18:04:42 -08:00
Romain Guy
35f24545e5
Disable the region compositing pipeline for layers.
...
This composition mode is affecting Gmail in a bad way. Disabling until
I can figure out the problem.
Change-Id: I00e657ea2d05fc7b4a606242d19dc84dd88c1e35
2011-01-11 18:01:25 -08:00
Romain Guy
a22bcfb6a4
am 6ed4a2f7: Merge "Disable the region compositing pipeline for layers." into honeycomb
...
* commit '6ed4a2f72531c2d9f256c19b09414aa9ea5da8c5':
Disable the region compositing pipeline for layers.
2011-01-11 18:00:31 -08:00
Dianne Hackborn
b5637c467d
am 45a8f53b: Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
...
* commit '45a8f53b25c8306c7f2c37f3a1d70ace21956e28':
Get rid of old ParcelFileDescriptor API.
2011-01-11 18:00:26 -08:00
Svetoslav Ganov
d7419986ca
Down arrow on the month can end up at the start of the month
...
bug:3338078
1. The bug was that I was claculating delta month and day from
the current date but was changing the latter in the middle
thus causing inconsistent state.
Change-Id: Id3082b01778fc2b3116aa412aff3f12e9ebf0c97
2011-01-11 17:59:32 -08:00
Romain Guy
a9d0711392
Don't break the build!
...
Change-Id: I42f68c7b023c03adeedc4e979e5f4705188ee9f4
2011-01-11 17:59:10 -08:00