OSDN Git Service
Hung-ying Tyan [Thu, 7 Oct 2010 00:08:43 +0000 (17:08 -0700)]
am
a785a59c: am
718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit '
a785a59c831256f274627f8f8eb77f9d54508916'
* commit '
a785a59c831256f274627f8f8eb77f9d54508916':
SIP: add SERVER_UNREACHABLE error code.
Hung-ying Tyan [Thu, 7 Oct 2010 00:08:34 +0000 (17:08 -0700)]
am
3cb2d3be: am
1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Merge commit '
3cb2d3be6cb501c77c7a5765d954363125857cca'
* commit '
3cb2d3be6cb501c77c7a5765d954363125857cca':
SipService: supply PendingIntent when open a profile.
Dianne Hackborn [Thu, 7 Oct 2010 00:08:15 +0000 (17:08 -0700)]
am
cb9f1e4d: am
6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit '
cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0'
* commit '
cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0':
Make it easier to figure out whether an app can go on sd card.
Neal Nguyen [Thu, 7 Oct 2010 00:07:58 +0000 (17:07 -0700)]
am
daa9b8c6: am
95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Merge commit '
daa9b8c69a3069d5533176e6caa286380b4675c2'
* commit '
daa9b8c69a3069d5533176e6caa286380b4675c2':
Fixing some flakiness of some DL Manager tests.
Jeff Brown [Thu, 7 Oct 2010 00:07:49 +0000 (17:07 -0700)]
am
f358cecb: am
79a3981e: Fix Looper leaks in MediaRecorderStressTest.
Merge commit '
f358cecb9cb2853ba0d6f54f350a92b1b5e247b2'
* commit '
f358cecb9cb2853ba0d6f54f350a92b1b5e247b2':
Fix Looper leaks in MediaRecorderStressTest.
Mathias Agopian [Thu, 7 Oct 2010 00:07:39 +0000 (17:07 -0700)]
am
ff04e97f: am
f4619308: Merge "fix [
2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit '
ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'
* commit '
ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
fix [
2835280] Add support for cancelling buffers to ANativeWindow
Mathias Agopian [Thu, 7 Oct 2010 00:07:30 +0000 (17:07 -0700)]
am
722665c5: am
ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit '
722665c5f76e81bed646490977ea30f38aaa00da'
* commit '
722665c5f76e81bed646490977ea30f38aaa00da':
fix build. SurfaceView.setFrame needed to be hidden
Mathias Agopian [Thu, 7 Oct 2010 00:04:44 +0000 (17:04 -0700)]
Merge "resolved conflicts for merge of
bba3b8ef to master"
Mathias Agopian [Thu, 7 Oct 2010 00:03:41 +0000 (17:03 -0700)]
resolved conflicts for merge of
bba3b8ef to master
Change-Id: I4a63f4be3b9f7d236e03e9b27f6d1da6f8ced449
Romain Guy [Thu, 7 Oct 2010 00:00:20 +0000 (17:00 -0700)]
Merge "Apply 3D transformations to gradient shaders."
Romain Guy [Wed, 6 Oct 2010 23:57:29 +0000 (16:57 -0700)]
Apply 3D transformations to gradient shaders.
This fixes only linear gradients. Sweep and radial gradients, as well as
bitmap shaders, will be fixed in a future commit.
Change-Id: I4eee4ff62e9bbf3b9339fc111a780167449ecfef
Mathias Agopian [Wed, 6 Oct 2010 23:53:36 +0000 (16:53 -0700)]
resolved conflicts for merge of
9fa7926b to master
Change-Id: I0d597d431ecebfb9d9d6e7902689c9ba95e75876
Mathias Agopian [Wed, 6 Oct 2010 23:45:56 +0000 (16:45 -0700)]
Merge "libagl: eglSwapInterval fix"
Ari Hirvonen [Fri, 1 Oct 2010 16:00:54 +0000 (19:00 +0300)]
libagl: eglSwapInterval fix
SW egl returned always EGL_FALSE even when the display was valid.
This made calls to eglSwapInterval to fail on HW since the wrapper
fails if either SW or HW egl fails.
Letting SW eglSwapInterval to return true when display is valid is
ok since spec says that interval parameter is silently clamped.
Change-Id: Ib4aa1dbfccf510a0f36621796e79a4d46852ee6a
Adam Powell [Wed, 6 Oct 2010 23:22:03 +0000 (16:22 -0700)]
Mathias Agopian [Wed, 6 Oct 2010 23:17:44 +0000 (16:17 -0700)]
am
b99e81ab: am
7e6064ad: Merge "fix [
3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Merge commit '
b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2'
* commit '
b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2':
fix [
3008290] passion GB surface does not send surfaceChanged notification after size change.
Elliott Hughes [Wed, 6 Oct 2010 23:17:27 +0000 (16:17 -0700)]
am
86214276: am
7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
Merge commit '
86214276e05d81e4820862341ce9e2e3c83cd136'
* commit '
86214276e05d81e4820862341ce9e2e3c83cd136':
Manually revert a single-line error inserted by OpenJDK.
James Dong [Wed, 6 Oct 2010 23:17:14 +0000 (16:17 -0700)]
am
a86a6c4e: am
6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit '
a86a6c4e326bfdfc351dacca95b23bb78f78efbe'
* commit '
a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
Fixed an issue where the reserved free space in the file writer was larger than intended
Nick Pelly [Wed, 6 Oct 2010 23:16:56 +0000 (16:16 -0700)]
am
c7bfb13f: am
15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit '
c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee'
* commit '
c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee':
New API stubs: NdefMessage and NdefRecord.
Alex Sakhartchouk [Wed, 6 Oct 2010 23:09:36 +0000 (16:09 -0700)]
Merge "changing vec4 to vec2 for perf reasons."
Gilles Debunne [Wed, 6 Oct 2010 23:07:42 +0000 (16:07 -0700)]
am
e9e94676: am
52810607: Revert "Restored ic_dialog_menu_generic asset."
Merge commit '
e9e9467688d46b9a1b2f5599bab1fe154b2eaf02'
* commit '
e9e9467688d46b9a1b2f5599bab1fe154b2eaf02':
Revert "Restored ic_dialog_menu_generic asset."
Gilles Debunne [Wed, 6 Oct 2010 21:38:27 +0000 (14:38 -0700)]
resolved conflicts for merge of
1153629c to master
Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e
Marco Nelissen [Wed, 6 Oct 2010 19:26:23 +0000 (12:26 -0700)]
Merge "Fix simulator build, part 1/n"
Marco Nelissen [Wed, 6 Oct 2010 19:23:02 +0000 (12:23 -0700)]
Fix simulator build, part 1/n
Change-Id: If0a42ab262ee6aa6381ce95bd49baf232adb01c5
Neel Parekh [Wed, 6 Oct 2010 18:45:55 +0000 (11:45 -0700)]
Merge "Fix pressed vs selected typo in onCreateDrawableState"
Neel Parekh [Wed, 6 Oct 2010 18:36:50 +0000 (11:36 -0700)]
Fix pressed vs selected typo in onCreateDrawableState
Change-Id: I7a415cacf29ed8c6c558f6b29902edd76fc98ea6
Irfan Sheriff [Wed, 6 Oct 2010 18:26:44 +0000 (11:26 -0700)]
Merge "Add LinkAddress"
Gil Dobjanschi [Wed, 6 Oct 2010 18:26:24 +0000 (11:26 -0700)]
Merge "Added VideoEditor reference to protected AudioTrack constructor"
Shimeng (Simon) Wang [Wed, 6 Oct 2010 18:20:05 +0000 (11:20 -0700)]
Merge "Add wrapper method for native JNI call."
Alex Sakhartchouk [Wed, 6 Oct 2010 18:15:01 +0000 (11:15 -0700)]
changing vec4 to vec2 for perf reasons.
Change-Id: Ic885a6dc697af4fd82e184158772863673f041bd
Irfan Sheriff [Fri, 1 Oct 2010 23:08:28 +0000 (16:08 -0700)]
Add LinkAddress
LinkAddress stores IP address + prefix for a network link
Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
Gil Dobjanschi [Wed, 6 Oct 2010 17:53:49 +0000 (10:53 -0700)]
Added VideoEditor reference to protected AudioTrack constructor
Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
Adam Cohen [Wed, 6 Oct 2010 17:43:18 +0000 (10:43 -0700)]
Merge "Fixing AdapterViewAnimator crash when associated adapter is empty"
Adam Cohen [Wed, 6 Oct 2010 17:37:51 +0000 (10:37 -0700)]
Fixing AdapterViewAnimator crash when associated adapter is empty
Change-Id: I3186452eb93f1141b06531507b13d87804e684d4
Irfan Sheriff [Wed, 22 Sep 2010 23:09:46 +0000 (16:09 -0700)]
Add proxy settings per wifi network
Provide per network proxy settings configuration
for wifi. This is stored along with the ip configuration
in ipconfig.txt
bug:
3039302
Change-Id: Ic8bc14493583be19fde3d7c463d1e5a77e6df25f
Gil Dobjanschi [Wed, 6 Oct 2010 17:25:20 +0000 (10:25 -0700)]
Merge "Added the video editor to the media items and audio track constructors."
Fred Quintana [Wed, 6 Oct 2010 17:03:19 +0000 (10:03 -0700)]
Merge "Make a separate active sync queue for initialization and regular syncs."
Gil Dobjanschi [Wed, 6 Oct 2010 16:54:34 +0000 (09:54 -0700)]
Added the video editor to the media items and audio track constructors.
Change-Id: I5db229d28c28e17b487257a9c4ed8c5fb7570a8d
Gil Dobjanschi [Wed, 6 Oct 2010 16:46:09 +0000 (09:46 -0700)]
Merge "Adjust start time and duration for overlays and effects."
Steve Block [Wed, 6 Oct 2010 15:30:13 +0000 (08:30 -0700)]
Merge "Make sure that we send the DeviceOrientation error event only once"
Steve Block [Wed, 25 Aug 2010 10:56:09 +0000 (11:56 +0100)]
Make sure that we send the DeviceOrientation error event only once
Change-Id: Iff095ad4d282635c567b0c85a286056e23ca38e3
Brian Carlstrom [Wed, 6 Oct 2010 05:23:41 +0000 (22:23 -0700)]
Fix instance count to be long
Change-Id: I88b17c4ff17a04db6e931f9b25885bdf05d4453c
Brian Carlstrom [Wed, 6 Oct 2010 04:34:06 +0000 (21:34 -0700)]
Adding android.os.Debug.countInstancesOfClass
- Debug.countInstancesOfClass is just a wrapper on
dalvik.system.VMDebug.countInstancesOfClass to avoid code from
depending on the dalvik classes directly
- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
and ViewDebug are converted to the new Debug.countInstancesOfClass
- Existing use of OpenSSLSocketImpl.instanceCount, which is being
removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)
Bug:
3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
Robert Greenwalt [Wed, 6 Oct 2010 02:14:45 +0000 (19:14 -0700)]
Merge "Turn on some debugging info"
Robert Greenwalt [Wed, 6 Oct 2010 02:12:26 +0000 (19:12 -0700)]
Turn on some debugging info
bug:
3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
James Dong [Wed, 6 Oct 2010 02:01:10 +0000 (19:01 -0700)]
Merge "Use setVideoSize API in StagefrightRecorder"
Romain Guy [Wed, 6 Oct 2010 01:16:35 +0000 (18:16 -0700)]
Merge "Optimize saveLayer() when the clip flag is set."
Romain Guy [Wed, 6 Oct 2010 01:14:38 +0000 (18:14 -0700)]
Optimize saveLayer() when the clip flag is set.
This speeds up applications, especially Launcher.
Dianne Hackborn [Wed, 6 Oct 2010 00:54:35 +0000 (17:54 -0700)]
Merge "Implement permission granting in clipboard."
Vasu Nori [Wed, 6 Oct 2010 00:46:36 +0000 (17:46 -0700)]
Merge "fix broken build"
Vasu Nori [Wed, 6 Oct 2010 00:45:37 +0000 (17:45 -0700)]
fix broken build
Change-Id: Ic00e8b98780d48928e05ee27f855e8211fb1ec47
Gil Dobjanschi [Wed, 6 Oct 2010 00:17:16 +0000 (17:17 -0700)]
Adjust start time and duration for overlays and effects.
Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
Fred Quintana [Tue, 5 Oct 2010 21:00:39 +0000 (14:00 -0700)]
Make a separate active sync queue for initialization and regular syncs.
This entails allowing multiple syncs to happen in parallel, with
different limits for regular and initialization syncs.
Change-Id: I0e47c6515af5c98faf899f91855b342b0d0c708c
Vasu Nori [Wed, 6 Oct 2010 00:08:53 +0000 (17:08 -0700)]
Merge "annotate some tests large - just in case they take longer. bug:
3066136"
Kenny Root [Wed, 6 Oct 2010 00:02:42 +0000 (17:02 -0700)]
am
bfa33b94: am
f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Merge commit '
bfa33b9484e2c0a019ab81f30261b9696df23a9b'
* commit '
bfa33b9484e2c0a019ab81f30261b9696df23a9b':
Use pread() in ZipFileRO for Linux
Gilles Debunne [Wed, 6 Oct 2010 00:02:27 +0000 (17:02 -0700)]
am
b3e95d9f: am
c37eac24: Restored ic_dialog_menu_generic asset.
Merge commit '
b3e95d9fc4365d20a39aa3ef61da537dabf5b800'
* commit '
b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
Restored ic_dialog_menu_generic asset.
Shimeng (Simon) Wang [Tue, 5 Oct 2010 23:59:05 +0000 (16:59 -0700)]
Add wrapper method for native JNI call.
This is to check whether a given mimeType is supported in Android media
framework.
issue:
2816278
Change-Id: I66d379d039c4e1f4a8528654ece006335fd4463f
Vasu Nori [Tue, 5 Oct 2010 23:53:57 +0000 (16:53 -0700)]
annotate some tests large - just in case they take longer. bug:
3066136
Change-Id: I89ab0454f592748f971b678a3ae23724eb6fc2e5
Vasu Nori [Tue, 5 Oct 2010 23:53:24 +0000 (16:53 -0700)]
Merge "turn off some useless messages"
Vasu Nori [Tue, 5 Oct 2010 23:50:51 +0000 (16:50 -0700)]
turn off some useless messages
Change-Id: I5ed5696cd052b70e7cf7b872205470cd56fada90
Gilles Debunne [Tue, 5 Oct 2010 23:16:20 +0000 (16:16 -0700)]
am
8556efe5: (-s ours) am
a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Merge commit '
8556efe5a34d8fc6ed99f1fdae60fa41b7647920'
* commit '
8556efe5a34d8fc6ed99f1fdae60fa41b7647920':
DO NOT MERGE. Select word no longer selects spaces between words.
Scott Main [Tue, 5 Oct 2010 23:15:44 +0000 (16:15 -0700)]
am
196894cd: am
c692792e: am
46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '
196894cdcc6883ed141ec0f6f2f577dbc613e08f'
* commit '
196894cdcc6883ed141ec0f6f2f577dbc613e08f':
docs: update homepage with more countries for market announcement
Alex Sakhartchouk [Tue, 5 Oct 2010 22:32:38 +0000 (15:32 -0700)]
Merge "Adding average fps counter. Removing rsLight from libRS"
Chet Haase [Tue, 5 Oct 2010 22:21:34 +0000 (15:21 -0700)]
Merge "Adding next/prev to fragment animations and to PreferenceActivity"
Scott Main [Tue, 5 Oct 2010 22:19:26 +0000 (15:19 -0700)]
Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced."
Scott Main [Tue, 5 Oct 2010 22:17:40 +0000 (15:17 -0700)]
am
fc7f3919: am
b3a5b85a: am
6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '
fc7f39196be7e7e741ece79b4b551c52cdb67f0d'
* commit '
fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
James Dong [Tue, 5 Oct 2010 22:17:29 +0000 (15:17 -0700)]
am
6a02ba01: am
b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit '
6a02ba0100e030e0b8bf2b6f195eabac1f1812db'
* commit '
6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
Resilent media time stamp adjustment
Gilles Debunne [Tue, 5 Oct 2010 22:17:17 +0000 (15:17 -0700)]
am
6f4f0106: am
b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
Merge commit '
6f4f01062bc78ae765c970e8796b8dbef432f8a4'
* commit '
6f4f01062bc78ae765c970e8796b8dbef432f8a4':
Removed icon in Alert dialog header.
Adam Powell [Tue, 5 Oct 2010 22:17:05 +0000 (15:17 -0700)]
am
dcbf315e: am
368733b2: Remove overscroll_edge.png from drawable/
Merge commit '
dcbf315e83234623622bd268a823ecc4dc49e375'
* commit '
dcbf315e83234623622bd268a823ecc4dc49e375':
Remove overscroll_edge.png from drawable/
Adam Powell [Tue, 5 Oct 2010 22:16:48 +0000 (15:16 -0700)]
am
b8d3bc5c: (-s ours) am
103f59ba: Merge "Fix bug
3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit '
b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'
* commit '
b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
Fix bug
3052686 - ScrollView padding treated incorrectly
Chet Haase [Tue, 5 Oct 2010 21:30:51 +0000 (14:30 -0700)]
Adding next/prev to fragment animations and to PreferenceActivity
Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would
either be placed onto or taken off of the stack, or would just replace the current
fragment. The new next/prev capability gives the ability to run a transition that is
specific to next/previous operations, such as navigating forward and backward in a list.
New next/prev animations may be associated with a fragment replace operation to get the
next/prev animations built into the system (next animates things up, prev animates them
down).
Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
Scott Main [Mon, 4 Oct 2010 23:03:15 +0000 (16:03 -0700)]
docs: Rewrite of App Fundamentals.. Part 1.
This introduces two new docs:
Activities
Provides a fundamental introduction to how activities work, including
the basics about layout, manifest entries, starting activies, getting results,
and the complete discussion about the lifecycle (which used to be in the
fundamentals.jd document under "Component Lifecycles"), but also now includes more
information about saving instance state (with new diagrams).
Tasks and Back Stack
A large expansion of the material originally presented in the fundamentals.jd
document under "Activities and Tasks". This doc talks all about how tasks and
the back stack work. This content re-organization is important because fragments
can now become a part of the back stack (which is a task-oriented concept), thus,
it's important to separate the task ideas from being tied directly to activities only,
which is how tasks are currently discussed. However, fragments are not yet discussed
here in detail---that will come later when the fragment dev guide is introduced.
Change-Id: I46425b5c2c3b928dc81bafd05a88ad3ea1c5be53
Romain Guy [Tue, 5 Oct 2010 22:00:01 +0000 (15:00 -0700)]
Merge "Add support for paletted textures."
Romain Guy [Tue, 5 Oct 2010 21:58:09 +0000 (14:58 -0700)]
Add support for paletted textures.
Change-Id: I36e6069bd58f78c609cdd1f3e4560c98f128f48e
Dianne Hackborn [Mon, 27 Sep 2010 21:58:44 +0000 (14:58 -0700)]
Implement permission granting in clipboard.
Change-Id: I9a7a949d1aaf4b3beabceaf807fb7d3b040e4ea8
Romain Guy [Tue, 5 Oct 2010 20:44:24 +0000 (13:44 -0700)]
Merge "Code cleanup and disable display lists for now."
Christopher Tate [Tue, 5 Oct 2010 20:43:44 +0000 (13:43 -0700)]
Merge "Make View.DragThumbnailBuilder a static class"
Romain Guy [Tue, 5 Oct 2010 18:49:57 +0000 (11:49 -0700)]
Code cleanup and disable display lists for now.
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
Jason Sams [Tue, 5 Oct 2010 20:35:47 +0000 (13:35 -0700)]
Merge "Implement allocation resizing."
Jason Sams [Tue, 5 Oct 2010 20:32:49 +0000 (13:32 -0700)]
Implement allocation resizing.
Change-Id: Ie38d42419d595cec730a8721cc1321c5edb6b4d6
Alex Sakhartchouk [Tue, 5 Oct 2010 20:23:55 +0000 (13:23 -0700)]
Adding average fps counter.
Removing rsLight from libRS
Change-Id: I8622efd10619dc120d37f3a12122e9c7fc34ff2e
Christopher Tate [Tue, 5 Oct 2010 20:06:41 +0000 (13:06 -0700)]
Make View.DragThumbnailBuilder a static class
It also now uses a WeakReference to the associated View, not a hard
object pointer.
Change-Id: I37e10b3155ee7e089a72bdf050cc2d323794810f
Alex Sakhartchouk [Tue, 5 Oct 2010 20:13:40 +0000 (13:13 -0700)]
Merge "Adding text metrics to renderscript."
Dianne Hackborn [Tue, 5 Oct 2010 19:54:41 +0000 (12:54 -0700)]
am
89230e3b: am
458fc5f5: Merge "Fix issue #
3041660: Camera image flips upside down when rotating device" into gingerbread
Merge commit '
89230e3b7b9ec455373e3f60b62ff65589a9c57d'
* commit '
89230e3b7b9ec455373e3f60b62ff65589a9c57d':
Fix issue #
3041660: Camera image flips upside down when rotating device
Vasu Nori [Tue, 5 Oct 2010 19:27:27 +0000 (12:27 -0700)]
Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db"
Gilles Debunne [Tue, 5 Oct 2010 19:26:22 +0000 (12:26 -0700)]
Merge "resolved conflicts for merge of
8390651c to master"
Gilles Debunne [Tue, 5 Oct 2010 19:11:56 +0000 (12:11 -0700)]
resolved conflicts for merge of
8390651c to master
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
Alex Sakhartchouk [Tue, 5 Oct 2010 18:33:27 +0000 (11:33 -0700)]
Adding text metrics to renderscript.
Change-Id: Ica460525243d714a278e4ad5e436af43e1008e0c
Ficus Kirkpatrick [Tue, 5 Oct 2010 18:33:03 +0000 (11:33 -0700)]
Merge "Reduce log spam."
Ficus Kirkpatrick [Tue, 5 Oct 2010 18:28:23 +0000 (11:28 -0700)]
Reduce log spam.
Remove the WifiService ACTION_BATTERY_CHANGED log message.
Change-Id: Idfcdf1661f9243a9eb043419490a7138533f3357
Adam Cohen [Mon, 4 Oct 2010 20:56:11 +0000 (13:56 -0700)]
Changing AdapterViewAnimator to use the new animation APIs
Change-Id: Ifefb83c391914ac623d75e0faca723b95786861d
Vasu Nori [Tue, 5 Oct 2010 17:48:49 +0000 (10:48 -0700)]
STOPSHIP - add illegalStateException to catch potential deadlocks in db
database lock() should not be called from a synchronized methods
in database layer. add code to check.
this will catch potential deadlock situations sooner
Change-Id: I9d913f5e2af304f4d9ad5b2641c3a768c4bc97f9
Joe Onorato [Tue, 5 Oct 2010 16:37:03 +0000 (12:37 -0400)]
manual merge Merge commit '
77e42376' into work
Conflicts:
packages/SystemUI/res/values/colors.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
Patrick Scott [Tue, 5 Oct 2010 13:30:24 +0000 (09:30 -0400)]
Add postSync so that the chrome stack has access.
Bug:
3053149
Change-Id: I75f5422afcacf4ae70a2aa26188446251d7f84da
Hung-ying Tyan [Tue, 5 Oct 2010 06:07:43 +0000 (23:07 -0700)]
am
718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit '
718e0033e69fa7d1db12242324ab9098ac430bf5' into gingerbread-plus-aosp
* commit '
718e0033e69fa7d1db12242324ab9098ac430bf5':
SIP: add SERVER_UNREACHABLE error code.
Hung-ying Tyan [Tue, 5 Oct 2010 06:07:39 +0000 (23:07 -0700)]
am
1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Merge commit '
1862af57b2c5ca5387b12974e8ef661651edb97d' into gingerbread-plus-aosp
* commit '
1862af57b2c5ca5387b12974e8ef661651edb97d':
SipService: supply PendingIntent when open a profile.
Dianne Hackborn [Tue, 5 Oct 2010 06:04:53 +0000 (23:04 -0700)]
am
6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit '
6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283' into gingerbread-plus-aosp
* commit '
6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283':
Make it easier to figure out whether an app can go on sd card.
Hung-ying Tyan [Tue, 5 Oct 2010 06:03:26 +0000 (23:03 -0700)]
Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Hung-ying Tyan [Tue, 5 Oct 2010 06:02:55 +0000 (23:02 -0700)]
Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Dianne Hackborn [Tue, 5 Oct 2010 06:00:25 +0000 (23:00 -0700)]
Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread