OSDN Git Service
Daniel Sandler [Thu, 7 Feb 2013 23:02:22 +0000 (15:02 -0800)]
am
fde19b10: New API to request a list of current notifications.
# Via Daniel Sandler
* commit '
fde19b106b2b77bc3540b04445357870caf878b5':
New API to request a list of current notifications.
Romain Guy [Thu, 7 Feb 2013 23:02:17 +0000 (15:02 -0800)]
am
da8d8b96: Merge "Add a RenderBuffer object to store stencil buffers. Bug #
7146141"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '
da8d8b9699fe8e9557389465007e333d3f03dcc1':
Add a RenderBuffer object to store stencil buffers. Bug #
7146141
Alon Albert [Thu, 7 Feb 2013 23:02:14 +0000 (15:02 -0800)]
am
2c45e913: Merge "Add Calendar Color Index to CalendarEntity"
# Via Alon Albert (1) and Android (Google) Code Review (1)
* commit '
2c45e913734a64460c6dcf5b831a32a0af5ba5c1':
Add Calendar Color Index to CalendarEntity
Daniel Sandler [Thu, 17 Jan 2013 05:21:05 +0000 (00:21 -0500)]
New API to request a list of current notifications.
The ACCESS_NOTIFICATIONS permission is signature|system only.
Change-Id: I41338230aee9611117cbdac251c1b6b6c3cebf00
Romain Guy [Thu, 7 Feb 2013 20:11:56 +0000 (20:11 +0000)]
Merge "Add a RenderBuffer object to store stencil buffers. Bug #
7146141"
Romain Guy [Thu, 7 Feb 2013 00:51:04 +0000 (16:51 -0800)]
Add a RenderBuffer object to store stencil buffers.
Bug #
7146141
This change is needed to add a render buffer cache to avoid
creating and destroying stencil buffers on every frame.
This change also allows the renderer to use a 1 bit or 4 bit
stencil buffer whenever possible.
Finally this change fixes a bug introduced by a previous CL
which causes the stencil buffer to not be updated in certain
conditions. The fix relies on a new optional parameter in
drawColorRects() that can be used to avoid performing a
quickReject on rectangles generated by the clip region.
Change-Id: I2f55a8e807009887b276a83cde9f53fd5c01199f
Alon Albert [Thu, 7 Feb 2013 19:54:52 +0000 (19:54 +0000)]
Merge "Add Calendar Color Index to CalendarEntity"
Alon Albert [Thu, 7 Feb 2013 19:50:27 +0000 (11:50 -0800)]
Add Calendar Color Index to CalendarEntity
Change-Id: I8dac2628fce44e37e5df1e19a97fc29934a6ba79
Jaikumar Ganesh [Thu, 7 Feb 2013 19:25:12 +0000 (11:25 -0800)]
am
e11f058e: am
d080bb07: am
b9620a89: am
9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Android Git Automerger (3) and others
* commit '
e11f058ee0c04be308126bb4fbc0c8e9901164c5':
Services: Adding HSPAP info in Android
Jaikumar Ganesh [Thu, 7 Feb 2013 19:19:59 +0000 (11:19 -0800)]
am
d080bb07: am
b9620a89: am
9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Android Git Automerger (2) and others
* commit '
d080bb07c88ca5ccf99f326789ed472448b50832':
Services: Adding HSPAP info in Android
Robert Greenwalt [Thu, 7 Feb 2013 19:07:23 +0000 (11:07 -0800)]
am
034170cd: Merge "Second pass tying into dns cache per interface"
# By Mattias Falk
# Via Android (Google) Code Review (1) and Robert Greenwalt (1)
* commit '
034170cd4ca17bdda2d0baae5f438f2786805147':
Second pass tying into dns cache per interface
Robert Greenwalt [Thu, 7 Feb 2013 19:02:47 +0000 (19:02 +0000)]
Merge "Second pass tying into dns cache per interface"
Jaikumar Ganesh [Thu, 7 Feb 2013 18:57:40 +0000 (10:57 -0800)]
am
b9620a89: am
9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Android Git Automerger (1) and others
* commit '
b9620a89bd734d749cd162cbcda4699474bbf57a':
Services: Adding HSPAP info in Android
Craig Mautner [Thu, 7 Feb 2013 18:54:21 +0000 (10:54 -0800)]
am
2ceb0815: Merge "Migrate AppWindowToken lists into DisplayContent."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
2ceb08150512ca121acc474d94f84357f0bf0bbf':
Migrate AppWindowToken lists into DisplayContent.
Craig Mautner [Thu, 7 Feb 2013 18:50:50 +0000 (18:50 +0000)]
Merge "Migrate AppWindowToken lists into DisplayContent."
Jaikumar Ganesh [Thu, 7 Feb 2013 18:46:10 +0000 (10:46 -0800)]
am
9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '
9434c112d1fef52ade78d7ef818daf981bf63bef':
Services: Adding HSPAP info in Android
Jaikumar Ganesh [Thu, 7 Feb 2013 17:54:41 +0000 (17:54 +0000)]
Merge "Services: Adding HSPAP info in Android"
Dianne Hackborn [Thu, 7 Feb 2013 08:37:36 +0000 (00:37 -0800)]
am
64d41d73: Fix build, conflict with another change.
# Via Dianne Hackborn
* commit '
64d41d7391e57886978e94e86cf01a167226dbfe':
Fix build, conflict with another change.
Dianne Hackborn [Thu, 7 Feb 2013 08:33:31 +0000 (00:33 -0800)]
Fix build, conflict with another change.
Change-Id: If4d7b6c814d946806838cee7dcaccba4c65c3d0f
Dianne Hackborn [Thu, 7 Feb 2013 08:07:06 +0000 (00:07 -0800)]
am
34e0b05e: Merge "App ops: track system windows, monitoring changes."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '
34e0b05e28b25dbe20c819ad4fa923c716c37e5f':
App ops: track system windows, monitoring changes.
Dianne Hackborn [Thu, 7 Feb 2013 08:03:13 +0000 (08:03 +0000)]
Merge "App ops: track system windows, monitoring changes."
Dianne Hackborn [Thu, 7 Feb 2013 07:14:49 +0000 (23:14 -0800)]
App ops: track system windows, monitoring changes.
Change-Id: I273e82bdad66ada3bf0f7ec9176bc304b9ee1ee8
Daniel Sandler [Thu, 7 Feb 2013 06:09:04 +0000 (22:09 -0800)]
am
8949b248: am
fb2b5e04: am
1fd77470: am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Android Git Automerger (3) and others
* commit '
8949b2480b8d4c99aa7d20508522a42421a9acef':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:09:01 +0000 (22:09 -0800)]
am
e24c67e3: am
2990ed7a: am
3c6ee5b5: am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Android Git Automerger (3) and others
* commit '
e24c67e32258bfedafbc2dc2861d4358950131f0':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 06:06:23 +0000 (22:06 -0800)]
am
fb2b5e04: am
1fd77470: am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Android Git Automerger (2) and others
* commit '
fb2b5e04a02669c764e4ebd7a6daf9846d596435':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:06:18 +0000 (22:06 -0800)]
am
2990ed7a: am
3c6ee5b5: am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Android Git Automerger (2) and others
* commit '
2990ed7a3bf7314bbd4d98161fbcdcf48098052c':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 06:03:55 +0000 (22:03 -0800)]
am
1fd77470: am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Android Git Automerger (1) and others
* commit '
1fd774709790b220bb780e95db7275d60a1eae57':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:03:51 +0000 (22:03 -0800)]
am
3c6ee5b5: am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Android Git Automerger (1) and others
* commit '
3c6ee5b509d6360a431290fff4b366848c293899':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 06:01:39 +0000 (22:01 -0800)]
am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Gerrit Code Review (1) and Jorge Ruesga (1)
* commit '
1a1e9b317ac2d737ad92a35c4d806f0fda1ede70':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:01:34 +0000 (22:01 -0800)]
am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Gerrit Code Review (1) and László Dávid (1)
* commit '
d2bec0960d04578182905b34795c6895760944dd':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 05:09:33 +0000 (05:09 +0000)]
Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
Jeffrey Brown [Thu, 7 Feb 2013 04:58:41 +0000 (20:58 -0800)]
am
6b7fcc8f: am
75701e8f: am
7eb4db35: am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Android Git Automerger (3) and Gerrit Code Review (2)
* commit '
6b7fcc8f6754f0bf7a406834a6dc066710a9de51':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:58:39 +0000 (20:58 -0800)]
am
8ca4642b: am
edc93331: am
a0d547b4: am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Android Git Automerger (3) and others
* commit '
8ca4642b7460057be0ee8ba97633d6fb1dfcd532':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:58:35 +0000 (20:58 -0800)]
am
a81a40e0: am
3c239d7e: am
8934c575: am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Android Git Automerger (3) and others
* commit '
a81a40e06d91b3b8936f9b275f73a19130fb0db1':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:58:32 +0000 (20:58 -0800)]
am
6bd6b1c4: am
4e68024c: am
1e48b386: am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Android Git Automerger (3) and others
* commit '
6bd6b1c436f9da46d01280cb080c2e810c50f390':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:58:28 +0000 (20:58 -0800)]
am
e03ff19d: am
e646f943: am
ca7b1210: am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Android Git Automerger (3) and others
* commit '
e03ff19d72bc9579321e0ff50257e803f645de73':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:58:25 +0000 (20:58 -0800)]
am
faffb8b2: am
f2873456: am
352d84b8: am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Android Git Automerger (3) and others
* commit '
faffb8b2ccbb220aea6e8299bbf4d6ad73c490ab':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:58:22 +0000 (20:58 -0800)]
am
8180bcee: am
3d33806a: am
1950d2e6: am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Android Git Automerger (3) and others
* commit '
8180bcee87e0888359d6ad5b58c57ca15ace554a':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:58:19 +0000 (20:58 -0800)]
am
8f149698: am
a3f82b1b: am
e4ce2517: am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Android Git Automerger (3) and others
* commit '
8f1496980e1b062cb97af57a841284142c05ee96':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:56:07 +0000 (20:56 -0800)]
am
75701e8f: am
7eb4db35: am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '
75701e8fc92285680637f69e0f004741919ddc10':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:56:03 +0000 (20:56 -0800)]
am
edc93331: am
a0d547b4: am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Android Git Automerger (2) and others
* commit '
edc933318c9690761866a4da63b551ae09054104':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:55:58 +0000 (20:55 -0800)]
am
3c239d7e: am
8934c575: am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Android Git Automerger (2) and others
* commit '
3c239d7e8d78570b1e17ad968c408506e73a8f3f':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:55:53 +0000 (20:55 -0800)]
am
4e68024c: am
1e48b386: am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Android Git Automerger (2) and others
* commit '
4e68024c7e9cf5849bc7c57266b0079113a2562f':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:55:49 +0000 (20:55 -0800)]
am
e646f943: am
ca7b1210: am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Android Git Automerger (2) and others
* commit '
e646f943fd7c4f9d81a4f2fb4de153a2ad9fd8bc':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:55:45 +0000 (20:55 -0800)]
am
f2873456: am
352d84b8: am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Android Git Automerger (2) and others
* commit '
f2873456dd2c7f93b63d4bd6bc0c742dfd153b62':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:55:41 +0000 (20:55 -0800)]
am
3d33806a: am
1950d2e6: am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Android Git Automerger (2) and others
* commit '
3d33806af0726487badc33d8b5ed6281b3c49bef':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:55:37 +0000 (20:55 -0800)]
am
a3f82b1b: am
e4ce2517: am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit '
a3f82b1b2dca74e7f287912cd85069dd74b8bf4d':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:53:25 +0000 (20:53 -0800)]
am
7eb4db35: am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
7eb4db35935237a6bd029d5bafda97fa5d4d905c':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:53:21 +0000 (20:53 -0800)]
am
a0d547b4: am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Android Git Automerger (1) and others
* commit '
a0d547b43b3508c7253da234f529acf60d00fd13':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:53:17 +0000 (20:53 -0800)]
am
8934c575: am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Android Git Automerger (1) and others
* commit '
8934c57564a864e046c5172ba7d56ab68056ab26':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:53:14 +0000 (20:53 -0800)]
am
1e48b386: am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Android Git Automerger (1) and others
* commit '
1e48b386eac8cb1ca9e6e50d73422661691512dc':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:53:10 +0000 (20:53 -0800)]
am
ca7b1210: am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Android Git Automerger (1) and others
* commit '
ca7b1210292c2fc80fd40f1f4c8662a1faf0b7a5':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:53:06 +0000 (20:53 -0800)]
am
352d84b8: am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Android Git Automerger (1) and others
* commit '
352d84b841e7c81c259f5de576ea127d177b39f8':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:53:03 +0000 (20:53 -0800)]
am
1950d2e6: am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Android Git Automerger (1) and others
* commit '
1950d2e6575e04fc623d1d0bcc32393ce4dfef93':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:52:59 +0000 (20:52 -0800)]
am
e4ce2517: am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '
e4ce25177bdf7720c6b3dd5ea7b48f6b03b06469':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:50:17 +0000 (20:50 -0800)]
am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Gerrit Code Review
* commit '
b9185fd1ffd85239e3ab10ab34cb9d8508970fb4':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:50:13 +0000 (20:50 -0800)]
am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Gerrit Code Review (1) and Masanori Ogino (1)
* commit '
dac4a90d656dca86bd14cd91d685c07d8a6b29a4':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:50:09 +0000 (20:50 -0800)]
am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '
88ba2f48a2d1193f3877575b2589897a7804aa75':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:50:04 +0000 (20:50 -0800)]
am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '
04ce0d253de9ec16f921824409a7b2c13195c19e':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:50:00 +0000 (20:50 -0800)]
am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Gerrit Code Review (1) and You Kim (1)
* commit '
ea56499dc36d863f92857ab7f93e5c4436f9654f':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:49:54 +0000 (20:49 -0800)]
am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Gerrit Code Review (1) and Roman Mazur (1)
* commit '
0d47af1131c4d4f9f29dad790d919d8599e3a3cc':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:49:47 +0000 (20:49 -0800)]
am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Gerrit Code Review (1) and git-lg-database.lge.com (1)
* commit '
af595a0f37643f12f32860fdea43fb67b74654b4':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:49:41 +0000 (20:49 -0800)]
am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
b314f433905ea2cbc62bd5af658f05261a752e5a':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:43:00 +0000 (04:43 +0000)]
Merge "NullPointerException in SQLiteSession"
Jeffrey Brown [Thu, 7 Feb 2013 04:42:31 +0000 (04:42 +0000)]
Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
Jeffrey Brown [Thu, 7 Feb 2013 04:40:30 +0000 (04:40 +0000)]
Merge "fix hover events consume issue"
Jeffrey Brown [Thu, 7 Feb 2013 04:39:35 +0000 (04:39 +0000)]
Merge "Disable usage of WAL in DatabaseHelper"
Jeffrey Brown [Thu, 7 Feb 2013 04:15:31 +0000 (04:15 +0000)]
Merge "Keep native callbacks when primary SQLiteConnection is recreated"
Jeffrey Brown [Thu, 7 Feb 2013 04:04:57 +0000 (04:04 +0000)]
Merge "Potential NPE in SQLiteConnection"
Jeffrey Brown [Thu, 7 Feb 2013 03:59:20 +0000 (03:59 +0000)]
Merge "Clear loaders array after they are destroyed."
Jeffrey Brown [Thu, 7 Feb 2013 03:48:22 +0000 (03:48 +0000)]
Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
Jeffrey Brown [Thu, 7 Feb 2013 03:46:47 +0000 (03:46 +0000)]
Merge "add reply.writeNoException() for quick response"
Stephen Hines [Thu, 7 Feb 2013 03:23:46 +0000 (19:23 -0800)]
am
1d9ea8a8: Merge "Rename convolve3x3.rs to prevent collisions."
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '
1d9ea8a83a72738ae1cd1fbd4035791e99f62eb6':
Rename convolve3x3.rs to prevent collisions.
Stephen Hines [Thu, 7 Feb 2013 03:19:34 +0000 (03:19 +0000)]
Merge "Rename convolve3x3.rs to prevent collisions."
Jason Sams [Thu, 7 Feb 2013 02:24:47 +0000 (18:24 -0800)]
am
3c672189: Merge "Implement rs.sendMessage()"
# Via Android (Google) Code Review (1) and Jason Sams (1)
* commit '
3c6721899ea903ed278feac1e76a97137fa9d0c3':
Implement rs.sendMessage()
Jason Sams [Thu, 7 Feb 2013 02:17:15 +0000 (02:17 +0000)]
Merge "Implement rs.sendMessage()"
Mattias Falk [Tue, 23 Aug 2011 12:15:13 +0000 (14:15 +0200)]
Second pass tying into dns cache per interface
Set dns servers for secondary nets and attach the
processes (pids) that are using the secondary nets
to the secondary nets associated dns cache.
bug:
5465296
Change-Id: I1eaf92d5c6b81d287e9fb2763b3d972d9de34395
Stephen Hines [Thu, 7 Feb 2013 01:33:18 +0000 (17:33 -0800)]
Rename convolve3x3.rs to prevent collisions.
Change-Id: I9046348959d51fda6142e16f1226fed0c57a6d16
Jeff Sharkey [Thu, 7 Feb 2013 00:46:51 +0000 (16:46 -0800)]
am
154be52a: Merge "Offer parsed TCP interface statistics."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '
154be52ae785a00ed091175e3eeed36d8ad14999':
Offer parsed TCP interface statistics.
Jeff Sharkey [Thu, 7 Feb 2013 00:37:57 +0000 (00:37 +0000)]
Merge "Offer parsed TCP interface statistics."
Jeff Sharkey [Wed, 6 Feb 2013 05:32:33 +0000 (21:32 -0800)]
Offer parsed TCP interface statistics.
Also switch to newer iface_stat_fmt numbers, which are measured at
XT level instead of dev.
Bug:
7903145,
6569689
Change-Id: Ibeb742966b8c89916ea31a49388a5dbe25a5f67f
Chris Craik [Thu, 7 Feb 2013 00:17:15 +0000 (16:17 -0800)]
am
1ba0289d: Merge "Add cap tessellation support"
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit '
1ba0289d18f16e190a3bc7cf9226d061016dc355':
Add cap tessellation support
Chris Craik [Thu, 7 Feb 2013 00:14:05 +0000 (00:14 +0000)]
Merge "Add cap tessellation support"
Maggie Benthall [Thu, 7 Feb 2013 00:08:50 +0000 (16:08 -0800)]
am
1095d9ac: Merge "Fix for SettingsProvider to query for correct user."
# Via Android (Google) Code Review (1) and Maggie Benthall (1)
* commit '
1095d9ac5df839408b9a549cc638c2909d98dfac':
Fix for SettingsProvider to query for correct user.
Maggie Benthall [Thu, 7 Feb 2013 00:04:59 +0000 (00:04 +0000)]
Merge "Fix for SettingsProvider to query for correct user."
Jeff Sharkey [Thu, 7 Feb 2013 00:00:37 +0000 (16:00 -0800)]
am
08d11e1f: Merge "Require that bugreport requesters have DUMP."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '
08d11e1fa939ecdda1ecc8bda750c07e924f06aa':
Require that bugreport requesters have DUMP.
Jeff Sharkey [Wed, 6 Feb 2013 23:57:44 +0000 (23:57 +0000)]
Merge "Require that bugreport requesters have DUMP."
Maggie Benthall [Mon, 4 Feb 2013 18:28:19 +0000 (13:28 -0500)]
Fix for SettingsProvider to query for correct user.
insertForUser takes a specified user and attempts to adjust that user's
settings, first looking at their existing settings to determine the difference.
However it was querying the settings for the calling user, rather than for
the user whose settings were being changed.
Also add a test that exercises the fix.
Change-Id: I6ed6fd79154ac1b6e6ab880769ac9081dfff6b80
Romain Guy [Wed, 6 Feb 2013 23:38:50 +0000 (15:38 -0800)]
am
511afdd3: Merge "Fix uninitialized variables in Caches.cpp Bug #
8151401"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '
511afdd3ac55ba27c5882cbe189d89a2942420b1':
Fix uninitialized variables in Caches.cpp Bug #
8151401
Mathias Agopian [Wed, 6 Feb 2013 23:38:47 +0000 (15:38 -0800)]
am
ed77dce8: Merge "rework SystemSensorManager.java"
# Via Android (Google) Code Review (1) and Mathias Agopian (1)
* commit '
ed77dce854ee6741ef9b276f642cdc79c981298f':
rework SystemSensorManager.java
Romain Guy [Wed, 6 Feb 2013 23:35:22 +0000 (15:35 -0800)]
am
83315e0c: Merge "Fix Snapshot::resetClip to also reset the clip region"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '
83315e0cb425db5dde514c90df56a7188c7983d5':
Fix Snapshot::resetClip to also reset the clip region
Chris Craik [Tue, 11 Dec 2012 01:56:27 +0000 (17:56 -0800)]
Add cap tessellation support
bug:
7117155
bug:
8114304
Currently used for lines (with and without AA) and arcs with useCenter=false
Also removes 0.375, 0.375 offset for AA lines
Change-Id: Ic8ace418739344db1e2814edf65253fe7448b0b0
Romain Guy [Wed, 6 Feb 2013 23:34:03 +0000 (23:34 +0000)]
Merge "Fix uninitialized variables in Caches.cpp Bug #
8151401"
Mathias Agopian [Wed, 6 Feb 2013 23:32:12 +0000 (23:32 +0000)]
Merge "rework SystemSensorManager.java"
Romain Guy [Wed, 6 Feb 2013 23:29:46 +0000 (15:29 -0800)]
Fix uninitialized variables in Caches.cpp
Bug #
8151401
Change-Id: I221f93de0f1981974f82a094297836dd3fe418bc
Romain Guy [Wed, 6 Feb 2013 23:29:15 +0000 (23:29 +0000)]
Merge "Fix Snapshot::resetClip to also reset the clip region"
Romain Guy [Wed, 6 Feb 2013 23:28:04 +0000 (15:28 -0800)]
Fix Snapshot::resetClip to also reset the clip region
Change-Id: I979151e73f64ff9d45f8a5232d8700361b09fbc7
Dake Gu [Wed, 6 Feb 2013 23:14:03 +0000 (15:14 -0800)]
am
d3a72135: am
bfb64e85: am
96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
# Via Android Git Automerger (2) and others
* commit '
d3a72135c82ae221881853912a6866467e86d9f2':
SimulatdDpad: fix NPE for event without device
Adam Powell [Wed, 6 Feb 2013 23:14:00 +0000 (15:14 -0800)]
am
2d9c0cac: am
044a4c3e: am
351f7817: am
21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Android Git Automerger (3) and others
* commit '
2d9c0cac8be1f4d8bafd57f61de9b59cd4dd55ea':
avoid multiple-"0" to exceed the length of upper bound
Dake Gu [Wed, 6 Feb 2013 23:11:29 +0000 (15:11 -0800)]
am
bfb64e85: am
96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and others
* commit '
bfb64e85e608889f18f4273b0f07a3d91d4082bd':
SimulatdDpad: fix NPE for event without device
OSDN Git Service
