OSDN Git Service
Steve Block [Tue, 28 Sep 2010 09:44:17 +0000 (10:44 +0100)]
Update the storage locations used by the Chromium HTTP stack
This updates the strorage locations to better match those used by the
Android HTTP stack.
The corresponding external/webkit change is
https://android-git.corp.google.com/g/70643
Bug:
3039536
Change-Id: Ia7ea68d1472e96788a7fbaa6e8f7aa1ee51b3fb0
Adam Powell [Tue, 28 Sep 2010 06:17:34 +0000 (23:17 -0700)]
Merge "Temporary hack to make context menu text visible on holo dialogs."
Adam Powell [Tue, 28 Sep 2010 06:12:39 +0000 (23:12 -0700)]
Temporary hack to make context menu text visible on holo dialogs.
Real fix for this to come. MenuBuilder needs to not hardcode themes
and dialogs shouldn't either.
Change-Id: I393969acd1ef6956d7299cb2eff46708ce812d1d
Adam Powell [Tue, 28 Sep 2010 05:29:15 +0000 (22:29 -0700)]
Merge "Fix some text styling for Holo.Light"
Adam Powell [Tue, 28 Sep 2010 04:19:32 +0000 (21:19 -0700)]
Fix some text styling for Holo.Light
Change-Id: Ia082c12b2b0cef044170ba92e9f837bd38516c8e
Hung-ying Tyan [Tue, 28 Sep 2010 05:01:49 +0000 (13:01 +0800)]
Fix build.
Change-Id: Iae02fabe42013705592f75748388daf8fa5ed54e
Hung-ying Tyan [Tue, 28 Sep 2010 04:17:44 +0000 (12:17 +0800)]
resolved conflicts for merge of
2a36a778 to master
Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
Gilles Debunne [Tue, 28 Sep 2010 04:03:40 +0000 (21:03 -0700)]
am
4e9243d5: (-s ours) am
8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '
4e9243d55ce183542c74550e503ea583643599a0'
* commit '
4e9243d55ce183542c74550e503ea583643599a0':
Updated assets in status bar. DO NOT MERGE.
Nick Kralevich [Tue, 28 Sep 2010 04:03:30 +0000 (21:03 -0700)]
am
d0cb228b: am
23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Merge commit '
d0cb228b9af0b67fa3372ee075287e7409249550'
* commit '
d0cb228b9af0b67fa3372ee075287e7409249550':
squeeze a few more bits of randomness into /dev/random
Winson Chung [Tue, 28 Sep 2010 04:03:17 +0000 (21:03 -0700)]
am
55ee8f93: am
44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '
55ee8f9329b4e99427dddc692e3d8ff10d9c9eef'
* commit '
55ee8f9329b4e99427dddc692e3d8ff10d9c9eef':
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Eric Fischer [Tue, 28 Sep 2010 04:03:02 +0000 (21:03 -0700)]
am
7063eb10: (-s ours) am
dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '
7063eb104657d1fa3f5e030b4657a9541ec6b054'
* commit '
7063eb104657d1fa3f5e030b4657a9541ec6b054':
Trim unwanted whitespace from translations. DO NOT MERGE
Gilles Debunne [Tue, 28 Sep 2010 04:02:41 +0000 (21:02 -0700)]
am
63555e36: (-s ours) am
0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Merge commit '
63555e36c9dd9b38624ae275ffc3f598a5112057'
* commit '
63555e36c9dd9b38624ae275ffc3f598a5112057':
Revert previous status bar assets. DO NOT MERGE.
Chris Palmer [Tue, 28 Sep 2010 04:02:20 +0000 (21:02 -0700)]
am
d4f1436d: (-s ours) am
143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
Merge commit '
d4f1436d6abf60bb299cc57330f7fc37cb161853'
* commit '
d4f1436d6abf60bb299cc57330f7fc37cb161853':
DO NOT MERGE Clarify the explanation of Android's security design.
Wu-cheng Li [Tue, 28 Sep 2010 03:50:22 +0000 (20:50 -0700)]
resolved conflicts for merge of
191a25e1 to master
Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
Kenny Root [Tue, 28 Sep 2010 03:32:56 +0000 (20:32 -0700)]
am
e7dd4e38: am
04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit '
e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d'
* commit '
e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d':
Use buffered I/O during certificate parsing
Dianne Hackborn [Tue, 28 Sep 2010 03:25:20 +0000 (20:25 -0700)]
resolved conflicts for merge of
a8bce7c8 to master
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
Vasu Nori [Tue, 28 Sep 2010 01:29:18 +0000 (18:29 -0700)]
Merge "fix this: closing database twice fails with IllegalStateException"
Dharmaray Kundargi [Tue, 28 Sep 2010 01:28:00 +0000 (18:28 -0700)]
Merge "work on review comments and code formating. Removed white spaces"
Vasu Nori [Tue, 28 Sep 2010 01:18:34 +0000 (18:18 -0700)]
fix this: closing database twice fails with IllegalStateException
Change-Id: Idda35e49d539845099b377872f9a6f0e0caa4626
Dianne Hackborn [Mon, 27 Sep 2010 01:34:53 +0000 (18:34 -0700)]
Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field. This is for HC, but doing in GB to avoid introducing
integration issues.
Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
Dharmaray Kundargi [Fri, 24 Sep 2010 00:44:41 +0000 (17:44 -0700)]
work on review comments and code formating.
Removed white spaces
Change-Id: Ic54817bfc205be536ec086bdfd34b35b0eeac1a3
Adam Powell [Thu, 23 Sep 2010 23:21:30 +0000 (16:21 -0700)]
Holo themes and assets in progress
Change-Id: Ic10480dc1c771d0ccd10f1d4014c945480fd6c0d
Hung-ying Tyan [Mon, 27 Sep 2010 23:29:33 +0000 (16:29 -0700)]
am
68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '
68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp
* commit '
68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
Move SipService out of SystemServer to phone process.
Hung-ying Tyan [Mon, 27 Sep 2010 23:25:49 +0000 (16:25 -0700)]
Merge "Move SipService out of SystemServer to phone process." into gingerbread
Irfan Sheriff [Mon, 27 Sep 2010 23:24:23 +0000 (16:24 -0700)]
Merge "use hostname when address null ProxyProperties parcelling"
Gilles Debunne [Mon, 27 Sep 2010 23:17:28 +0000 (16:17 -0700)]
am
8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '
8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp
* commit '
8d7057df401af668335c38273bc62872e4dbf538':
Updated assets in status bar. DO NOT MERGE.
Jeff Brown [Mon, 27 Sep 2010 23:11:23 +0000 (16:11 -0700)]
Merge "Add support for transferring touch focus."
Jeff Brown [Mon, 27 Sep 2010 21:52:15 +0000 (14:52 -0700)]
Add support for transferring touch focus.
Prerequisite for drag and drop.
Change-Id: Iedbe93ed0f3e1c4083130fe66b4ba06d416afce0
Gilles Debunne [Mon, 27 Sep 2010 23:07:47 +0000 (16:07 -0700)]
Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Gilles Debunne [Mon, 27 Sep 2010 22:55:21 +0000 (15:55 -0700)]
Updated assets in status bar. DO NOT MERGE.
Unlock has a 1 pixel offset that has to be fixed by code.
dropdown untested on device.
Most of these should be removed from SystemUI (revert 68833).
Pass 4.
Change-Id: Ibbbe4cc404151ec28768af98509082d77b303abe
Joe Onorato [Mon, 27 Sep 2010 22:55:23 +0000 (15:55 -0700)]
Merge "Don't show X for notifications that can't be cleared"
Joe Onorato [Mon, 27 Sep 2010 22:54:55 +0000 (15:54 -0700)]
Merge "Hide the "Clear all" button in the notification panel if there are no clearable notifications."
Joe Onorato [Mon, 27 Sep 2010 22:53:44 +0000 (15:53 -0700)]
Don't show X for notifications that can't be cleared
Bug:
3038418
Change-Id: Ic27c2e686b918c0238b85658700925c51311df06
Joe Onorato [Mon, 27 Sep 2010 22:34:04 +0000 (15:34 -0700)]
Hide the "Clear all" button in the notification panel if there are no clearable notifications.
Change-Id: I7145036724939220e1f23fb91c62027b28663c20
Nick Kralevich [Mon, 27 Sep 2010 22:26:51 +0000 (15:26 -0700)]
am
23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Merge commit '
23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp
* commit '
23142acffab69738b967812fdbdf7bbda18a44d8':
squeeze a few more bits of randomness into /dev/random
Nick Kralevich [Mon, 27 Sep 2010 22:23:45 +0000 (15:23 -0700)]
Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Winson Chung [Mon, 27 Sep 2010 22:08:57 +0000 (15:08 -0700)]
am
44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '
44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp
* commit '
44e8ff9924db43ee2470d868ce31b1c039c99b35':
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Winson Chung [Mon, 27 Sep 2010 21:36:52 +0000 (14:36 -0700)]
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Change-Id: I15a78a5c5a18b041b1cc4a7500bd3ceccd780ea9
Eric Fischer [Mon, 27 Sep 2010 22:04:35 +0000 (15:04 -0700)]
am
dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '
dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp
* commit '
dc36da514832484f61b432291c6f5dca9f2c30bd':
Trim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 22:01:33 +0000 (15:01 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Nick Kralevich [Mon, 27 Sep 2010 21:49:00 +0000 (14:49 -0700)]
squeeze a few more bits of randomness into /dev/random
Change-Id: Ida30c33985411f353c828b43ea26ca1b7e6502af
Eric Fischer [Mon, 27 Sep 2010 21:41:54 +0000 (14:41 -0700)]
Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I39809e844c12e283f2ed65b8fc5a6fbe14311071
Jeff Brown [Mon, 27 Sep 2010 21:40:38 +0000 (14:40 -0700)]
am
9785bf0f: am
14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '
9785bf0f2b6b8758aed7ded3b996a2ef0be89919'
* commit '
9785bf0f2b6b8758aed7ded3b996a2ef0be89919':
Add suuport for splitting touch events across windows.
Joe Onorato [Mon, 27 Sep 2010 21:38:37 +0000 (14:38 -0700)]
am
761427f8: am
524ae7dd: Merge "We only need at most one tty icon." into gingerbread
Merge commit '
761427f85b7b7478801dcb4e0fb2f1b824cf1268'
* commit '
761427f85b7b7478801dcb4e0fb2f1b824cf1268':
We only need at most one tty icon.
Gilles Debunne [Mon, 27 Sep 2010 21:32:06 +0000 (14:32 -0700)]
am
0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Merge commit '
0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp
* commit '
0ba5b647842ab71f4b1a3080ca113eb646371d91':
Revert previous status bar assets. DO NOT MERGE.
Gilles Debunne [Mon, 27 Sep 2010 21:26:56 +0000 (14:26 -0700)]
Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Hung-ying Tyan [Sat, 25 Sep 2010 14:49:59 +0000 (22:49 +0800)]
Move SipService out of SystemServer to phone process.
Companion CL: https://android-git/g/#change,70187
http://b/issue?id=
2998069
Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
Chris Palmer [Mon, 27 Sep 2010 21:18:15 +0000 (14:18 -0700)]
am
143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
Merge commit '
143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp
* commit '
143e61097e3aa2f6fd2951c707f35c35d3be25e3':
DO NOT MERGE Clarify the explanation of Android's security design.
Alex Sakhartchouk [Mon, 27 Sep 2010 21:15:39 +0000 (14:15 -0700)]
Merge "Error checking for MVP matrix computation. Fixing more padding bugs."
Vasu Nori [Mon, 27 Sep 2010 21:15:08 +0000 (14:15 -0700)]
Merge "reduce synchronization on SQLiteDatabase wherever possible"
Joe Onorato [Mon, 27 Sep 2010 21:14:47 +0000 (14:14 -0700)]
Merge "Merge commit '
f9f9e248' into manualmerge"
Joe Onorato [Mon, 27 Sep 2010 21:13:46 +0000 (14:13 -0700)]
Merge commit '
f9f9e248' into manualmerge
Conflicts:
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
Wu-cheng Li [Mon, 27 Sep 2010 21:12:49 +0000 (14:12 -0700)]
am
83ea6389: Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Merge commit '
83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp
* commit '
83ea6389097570e8526a0b612051bb591186f165':
The old overlay should be destroyed if orientation changes.
Chris Palmer [Fri, 24 Sep 2010 22:08:51 +0000 (15:08 -0700)]
DO NOT MERGE Clarify the explanation of Android's security design.
Assert plainly that Dalvik is not a boundary.
Certificates are for distinction, not "fake trustworthiness through
verifying cheap identities".
Clarify that UID + GID are what the kernel bases its protection on, not PID.
This is a fuzzy distinction on Android since (apart from sharedUserId and
magical system processes) there is a 1:1 mapping from process <-> UID. But
it's important to clarify what we mean.
Clarify up front about the staticness (staticity?) of permissions. It's
explained lower down, but experience shows people don't read that far down.
Get the rationale (bad UX --> bad security) right up top.
Change-Id: I403310668d7ba42e44239055cb480c086ef76cbc
Wu-cheng Li [Mon, 27 Sep 2010 21:09:02 +0000 (14:09 -0700)]
Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Vasu Nori [Mon, 27 Sep 2010 21:05:09 +0000 (14:05 -0700)]
reduce synchronization on SQLiteDatabase wherever possible
Change-Id: Ibb8617667752eab45d29b01d332b68c3547bdea8
Gilles Debunne [Mon, 27 Sep 2010 20:54:23 +0000 (13:54 -0700)]
Revert previous status bar assets. DO NOT MERGE.
Change-Id: I5906a15124f7efe9b19bba18d91d6ddc089601f2
Vasu Nori [Mon, 27 Sep 2010 19:32:57 +0000 (12:32 -0700)]
remove public API setConnectionPoolSize()
because connection pool size is now settable by modifying config.xml
of the device.
Change-Id: I973cc11d7dc10c8d95ab83e2f691068f6019fa33
Kenny Root [Mon, 27 Sep 2010 19:48:05 +0000 (12:48 -0700)]
am
04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit '
04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp
* commit '
04a426f5b50a628fb73bc29b003b0e5bece17c27':
Use buffered I/O during certificate parsing
Kenny Root [Mon, 27 Sep 2010 19:45:44 +0000 (12:45 -0700)]
Merge "Use buffered I/O during certificate parsing" into gingerbread
Dianne Hackborn [Mon, 27 Sep 2010 19:45:31 +0000 (12:45 -0700)]
am
d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit '
d8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp
* commit '
d8691d73d158acd9ffc63748126e822afd656707':
Allow all apps to call ContentResolver.getType().
Dianne Hackborn [Mon, 27 Sep 2010 19:42:34 +0000 (12:42 -0700)]
Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Jeff Brown [Mon, 27 Sep 2010 19:37:03 +0000 (12:37 -0700)]
am
14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '
14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp
* commit '
14a288da6a372230d9af41da12241fe500eec837':
Add suuport for splitting touch events across windows.
Jeff Brown [Mon, 27 Sep 2010 19:33:14 +0000 (12:33 -0700)]
Merge "Add suuport for splitting touch events across windows." into gingerbread
Guang Zhu [Mon, 27 Sep 2010 19:22:17 +0000 (12:22 -0700)]
Merge "skip 2d.drawImage.broken.html layout test"
Guang Zhu [Mon, 27 Sep 2010 19:20:25 +0000 (12:20 -0700)]
skip 2d.drawImage.broken.html layout test
this test currently blocks on some type of test devices
Change-Id: Ifacc520c441cf4142b5e6d28bde2b86728b5fc35
Irfan Sheriff [Sun, 26 Sep 2010 21:54:54 +0000 (14:54 -0700)]
use hostname when address null ProxyProperties parcelling
In ProxyProperties parcel, use toString so that hostname
is used when address is null
Change-Id: I4813dbdaf3c4a7bb404edf960d0f990c732ec0b8
Hung-ying Tyan [Mon, 27 Sep 2010 18:57:08 +0000 (11:57 -0700)]
Joe Onorato [Mon, 27 Sep 2010 18:56:29 +0000 (11:56 -0700)]
am
524ae7dd: Merge "We only need at most one tty icon." into gingerbread
Merge commit '
524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp
* commit '
524ae7dd149c6b10814282dc3e2e55a4f755ad29':
We only need at most one tty icon.
Joe Onorato [Mon, 27 Sep 2010 18:56:24 +0000 (11:56 -0700)]
am
6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread
Merge commit '
6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp
* commit '
6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
If an icon add remove get coalesced, don't remove some other icon.
Hung-ying Tyan [Mon, 27 Sep 2010 18:52:35 +0000 (11:52 -0700)]
Wu-cheng Li [Fri, 24 Sep 2010 00:17:43 +0000 (17:17 -0700)]
The old overlay should be destroyed if orientation changes.
Previously the orientation was wrong after suspend and resume.
When the camera app is resumed behide the lock screen, it
orinteation is portrait. When users slide to unlock the screen,
surfaceChanged is called and the orientation is landscape.
The camera app stops the preview, sets the display orientation,
and starts the preview. Overlay should be destroyed if the
orientation has changed.
bug:
3031640
Change-Id: I38b527f9ea78c91b538463292152c023383b4695
Hung-ying Tyan [Mon, 27 Sep 2010 18:47:42 +0000 (11:47 -0700)]
am
44669d31: am
fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Merge commit '
44669d31d1d5b094d7b7d3e393281440ea0c9536'
* commit '
44669d31d1d5b094d7b7d3e393281440ea0c9536':
SipAudioCall: remove SipManager dependency.
Hung-ying Tyan [Mon, 27 Sep 2010 18:47:37 +0000 (11:47 -0700)]
Hung-ying Tyan [Mon, 27 Sep 2010 18:47:32 +0000 (11:47 -0700)]
am
fe2d279c: am
00a22064: SipService: handle cross-domain authentication error
Merge commit '
fe2d279c5ef571340f20d433badd9f68072299af'
* commit '
fe2d279c5ef571340f20d433badd9f68072299af':
SipService: handle cross-domain authentication error
Dan Morrill [Mon, 27 Sep 2010 18:45:51 +0000 (11:45 -0700)]
am
c6581a10: am
4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details
Merge commit '
c6581a1046b062d0e06e50e9b09e6c12a8e54efc'
* commit '
c6581a1046b062d0e06e50e9b09e6c12a8e54efc':
Adding a feature to indicate that the device possesses low-latency audio.
Joe Onorato [Mon, 27 Sep 2010 18:41:24 +0000 (11:41 -0700)]
Merge "We only need at most one tty icon." into gingerbread
Joe Onorato [Mon, 27 Sep 2010 18:40:15 +0000 (11:40 -0700)]
Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread
Vasu Nori [Mon, 27 Sep 2010 18:39:44 +0000 (11:39 -0700)]
Merge "bug:
2868568 reduce the message level from error to warning"
Vasu Nori [Mon, 27 Sep 2010 18:37:54 +0000 (11:37 -0700)]
bug:
2868568 reduce the message level from error to warning
it is a rather harmless message. no need to set ERROR level
and no need to make it sound so fatal
Change-Id: I9d00563a3b869d8223cb21a98014c02535021d11
Joe Onorato [Mon, 27 Sep 2010 18:35:53 +0000 (11:35 -0700)]
We only need at most one tty icon.
Change-Id: Id8e2c6ba9b15ebafcf12b484f175fdaf98c1fa8a
Joe Onorato [Mon, 27 Sep 2010 18:34:46 +0000 (11:34 -0700)]
If an icon add remove get coalesced, don't remove some other icon.
Also adds a test case and turns off the extra logging we added to debug this.
Change-Id: I8640938ae4d1e75c88213177888f363e05ce0fa0
Mike Lockwood [Mon, 27 Sep 2010 18:26:27 +0000 (11:26 -0700)]
Merge "MTP: Fix local reference leaks."
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:35 +0000 (11:20 -0700)]
am
fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Merge commit '
fd144d7667d9d050b7fb158276ae4623d4ea83b8' into gingerbread-plus-aosp
* commit '
fd144d7667d9d050b7fb158276ae4623d4ea83b8':
SipAudioCall: remove SipManager dependency.
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:30 +0000 (11:20 -0700)]
am
025a39af: SIP: misc fixes
Merge commit '
025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp
* commit '
025a39af346f39743c1e384b9000ce1baee36562':
SIP: misc fixes
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:24 +0000 (11:20 -0700)]
am
00a22064: SipService: handle cross-domain authentication error
Merge commit '
00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp
* commit '
00a22064efef4f574e439079aae2deae1a087a31':
SipService: handle cross-domain authentication error
Hung-ying Tyan [Mon, 27 Sep 2010 18:16:32 +0000 (02:16 +0800)]
Fix build.
Change-Id: Ie47b63f02764e8a1ca1d36f502b6b4134859ff0d
Gil Dobjanschi [Mon, 27 Sep 2010 18:15:24 +0000 (11:15 -0700)]
Merge "Bug fix: getDuration vs. getDurationTimeline"
Jamie Gennis [Mon, 27 Sep 2010 18:12:15 +0000 (11:12 -0700)]
Merge "Fix the CameraHardwareInterface::setPreviewWindow comment."
Hung-ying Tyan [Mon, 27 Sep 2010 17:54:27 +0000 (10:54 -0700)]
Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Hung-ying Tyan [Thu, 23 Sep 2010 03:35:05 +0000 (11:35 +0800)]
SIP: misc fixes
+ check REQUEST_TERMINATED response on INVITE not CANCEL,
+ check if a TransactionTerminatedEvent matches the ongoing transaction,
+ add log to track SipConnection disconnect events.
Change-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad
Hung-ying Tyan [Sat, 25 Sep 2010 15:21:23 +0000 (23:21 +0800)]
SipService: handle cross-domain authentication error
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.
http://b/issue?id=
3020185
Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
Dan Morrill [Mon, 27 Sep 2010 17:39:19 +0000 (10:39 -0700)]
am
4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d
Merge commit '
4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp
* commit '
4e9751f0770c8bfe6f7d57465cba754af5aa942b':
Adding a feature to indicate that the device possesses low-latency audio.
Dan Morrill [Mon, 27 Sep 2010 17:30:41 +0000 (10:30 -0700)]
Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread
Alex Sakhartchouk [Mon, 27 Sep 2010 17:29:47 +0000 (10:29 -0700)]
Error checking for MVP matrix computation.
Fixing more padding bugs.
Change-Id: Ic5d4260027b7dc86a50fdab7221c7296c7d3ea0d
Gil Dobjanschi [Sun, 26 Sep 2010 17:53:48 +0000 (10:53 -0700)]
Bug fix: getDuration vs. getDurationTimeline
Change-Id: I41a40a3fc3b3674b5fcacecda174e924211b4ad2
Huahui Wu [Mon, 27 Sep 2010 17:22:40 +0000 (10:22 -0700)]
Merge "Bug
2372180: pass multi-touch events from browser to webkit. Since the UI uses multi-touch for zooming, the event is passed to webkit only when the webpage doesn't allow zooming. 1. Updated the data structure TouchEventData in WebViewCore.java to take multiple points and used it everywhere. 2. Added a passMultiTouchToWebkit() function to do what its name means. 3. Added the multi-point touch support to dumprendertree."
Mike Lockwood [Mon, 27 Sep 2010 17:18:47 +0000 (10:18 -0700)]
Merge changes I424ba760,Ic0826085
* changes:
MTP: Implement extra object properties for audio, video and image files
MediaStore: Add helper method to create Uri for querying genre for an audio file
Mike Lockwood [Mon, 27 Sep 2010 14:01:00 +0000 (10:01 -0400)]
MTP: Fix local reference leaks.
We cannot rely on the VM automatically freeing local references for us
in a timely manner in JNI code that is not called directly from Java.
Change-Id: I6ee8a9a97cb557b9d3b2ace4e4d20467b436fb9c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Sun, 26 Sep 2010 16:35:51 +0000 (12:35 -0400)]
MTP: Implement extra object properties for audio, video and image files
Read-only support at this point.
BUG:
2869730
Change-Id: I424ba760c8f5f4af394bd65276f19438fa6da6cb
Signed-off-by: Mike Lockwood <lockwood@android.com>