OSDN Git Service
Mathias Agopian [Sat, 29 Jan 2011 17:40:14 +0000 (09:40 -0800)]
am
043a3cdd: (-s ours) Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '
043a3cddf67e2baf38711bcb125084599f8f9802':
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
Mathias Agopian [Sat, 29 Jan 2011 17:40:06 +0000 (09:40 -0800)]
am
d3fcd0a1: (-s ours) Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit '
d3fcd0a1c923498921107bb44fbc8b24582a170a':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:37:44 +0000 (09:37 -0800)]
Merge
f126ad3b from gingerbread
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
Marco Nelissen [Sat, 29 Jan 2011 17:32:05 +0000 (09:32 -0800)]
am
c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit '
c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
Nick Pelly [Sat, 29 Jan 2011 17:31:56 +0000 (09:31 -0800)]
am
b134223f: Make Mifare Classic increment/decrement operands little endian
* commit '
b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
Hung-ying Tyan [Sat, 29 Jan 2011 17:31:40 +0000 (09:31 -0800)]
am
cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit '
cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
Get mute state from active call.
Hung-ying Tyan [Sat, 29 Jan 2011 17:31:19 +0000 (09:31 -0800)]
am
14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '
14b6d0620b42d1bb3a55778ba452d838a0d89223':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
Jeff Brown [Sat, 29 Jan 2011 17:27:55 +0000 (09:27 -0800)]
am
d8bdc06f: (-s ours) Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit '
d8bdc06f8139231f1edc1a8bf22b637ebb790605':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
Andreas Huber [Sat, 29 Jan 2011 15:30:57 +0000 (07:30 -0800)]
am
efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit '
efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Justin Ho [Sat, 29 Jan 2011 15:30:39 +0000 (07:30 -0800)]
am
28c4f69a: Updated checkbox assets
* commit '
28c4f69a938766076c14e8f5b07951ec2a9f610d':
Updated checkbox assets
Arnaud Ferir [Sat, 29 Jan 2011 15:30:07 +0000 (07:30 -0800)]
am
5e81a6e2: Fix trace mismatch.
* commit '
5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
Fix trace mismatch.
Sylvain Fonteneau [Sat, 29 Jan 2011 15:29:56 +0000 (07:29 -0800)]
am
c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit '
c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
John Wang [Sat, 29 Jan 2011 15:29:42 +0000 (07:29 -0800)]
am
93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '
93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:27:06 +0000 (07:27 -0800)]
Merge
c896d85c from gingerbread
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:17:22 +0000 (07:17 -0800)]
Merge
da01b4ab from gingerbread
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
Jeff Hamilton [Sat, 29 Jan 2011 15:09:21 +0000 (07:09 -0800)]
am
e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit '
e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
Jim Miller [Sat, 29 Jan 2011 15:08:58 +0000 (07:08 -0800)]
am
42a46157: Fix
3379239: Catch exceptions from workaround for OOM.
* commit '
42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix
3379239: Catch exceptions from workaround for OOM.
Jaikumar Ganesh [Sat, 29 Jan 2011 02:45:14 +0000 (18:45 -0800)]
am
1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '
1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
John Reck [Sat, 29 Jan 2011 02:44:57 +0000 (18:44 -0800)]
am
398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
* commit '
398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
Jeff Hamilton [Sat, 29 Jan 2011 02:41:42 +0000 (20:41 -0600)]
resolved conflicts for merge of
dc54a8c7 to honeycomb-merge
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
Jean-Michel Trivi [Sat, 29 Jan 2011 01:37:12 +0000 (17:37 -0800)]
am
a314f32b: (-s ours) Merge "Bug
3365937 notify TTS initialization listener of binding errors" into gingerbread
* commit '
a314f32ba92d46687aef9f420eb61491eff485cf':
Bug
3365937 notify TTS initialization listener of binding errors
Jeff Hamilton [Fri, 28 Jan 2011 05:39:31 +0000 (23:39 -0600)]
resolved conflicts for merge of
a314f32b to honeycomb-merge
Change-Id: I98d37ee8666d9d3f195d2b23d50dc851f1ef6500
Eric Laurent [Fri, 28 Jan 2011 05:21:04 +0000 (21:21 -0800)]
am
c5694ebd: (-s ours) Merge "do not merge - Fix issue
3371096." into gingerbread
* commit '
c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
do not merge - Fix issue
3371096.
Dianne Hackborn [Fri, 28 Jan 2011 03:57:58 +0000 (19:57 -0800)]
am
11576102: (-s ours) Fix issue #
3373438: Update GBMR versions
* commit '
11576102a9794ef964a08bc372dc09803f58997a':
Fix issue #
3373438: Update GBMR versions
Dave Sparks [Fri, 28 Jan 2011 03:49:59 +0000 (19:49 -0800)]
am
65d39eeb: (-s ours) Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
* commit '
65d39eeb9b032e5507a01daa25afff62b29bffe4':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
Mathias Agopian [Fri, 28 Jan 2011 03:49:40 +0000 (19:49 -0800)]
am
822d4ce6: Merge "fix [
3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
* commit '
822d4ce61687d386f9630b33113c6193257d6878':
fix [
3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly
Jeff Brown [Fri, 28 Jan 2011 03:41:07 +0000 (19:41 -0800)]
am
d0725eef: (-s ours) Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
* commit '
d0725eef671c059b8e26d900fee655747f506dbe':
Never drag scroll views with no children. (DO NOT MERGE)
Mathias Agopian [Fri, 28 Jan 2011 02:39:21 +0000 (18:39 -0800)]
am
a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
* commit '
a0bafb471385767f7c9c91efe7fd828b069b2e97':
Use EGL_NATIVE_VISUAL_ID to select EGLConfig
Andreas Huber [Fri, 28 Jan 2011 02:38:21 +0000 (18:38 -0800)]
am
e9a00235: (-s ours) Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
* commit '
e9a00235c102d198a702bc665b2ea5b5e8c4bc07':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
Nick Pelly [Fri, 28 Jan 2011 02:35:19 +0000 (18:35 -0800)]
resolved conflicts for merge of
b7d6ffd7 to honeycomb-merge
Change-Id: If5553e0b51513687c4012600d92323617190fb6c
Nick Pelly [Fri, 28 Jan 2011 02:29:13 +0000 (18:29 -0800)]
am
50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
* commit '
50d0bcb45beb30746271b620ab23ad4d69fd9d5b':
Support for TagLostException (API).
Brad Fitzpatrick [Fri, 28 Jan 2011 02:28:54 +0000 (18:28 -0800)]
am
597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread
* commit '
597fa828fa2b3cba053f0afeeac877b1ee2d24b7':
Watchdog can get deadlocked on activity manager
Nick Pelly [Fri, 28 Jan 2011 02:28:25 +0000 (18:28 -0800)]
am
b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
* commit '
b735aa0b6fabb72097191923d8787b43fa52531e':
Fix javadoc which broke build.
Eric Laurent [Fri, 28 Jan 2011 02:25:32 +0000 (18:25 -0800)]
resolved conflicts for merge of
00118a48 to honeycomb-merge
Change-Id: I27d24fb00e36bdaadbdf646bb8bf7b5639556369
Nick Pelly [Fri, 28 Jan 2011 01:29:59 +0000 (17:29 -0800)]
am
e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
* commit '
e4dd154c08b04090bad8f450450e13163d5fef9b':
hange the default IsoDep timeout to 300ms (docs update).
Mathias Agopian [Fri, 28 Jan 2011 01:28:47 +0000 (17:28 -0800)]
am
12d014fd: Merge "fix [
3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
* commit '
12d014fdf40f69512e59e84914b230a2d3e7b8eb':
fix [
3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
Amith Yamasani [Fri, 28 Jan 2011 01:28:31 +0000 (17:28 -0800)]
am
68153821: (-s ours) Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
* commit '
68153821481f748ecbd2493bfd417005686960e0':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
Irfan Sheriff [Fri, 28 Jan 2011 01:04:07 +0000 (17:04 -0800)]
am
4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
* commit '
4170b46329ed91e81cf22dba82e2dadc326b3e3d':
Do not add unsolicited events to queue
Jeff Brown [Fri, 28 Jan 2011 01:03:51 +0000 (17:03 -0800)]
am
41395459: (-s ours) Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
* commit '
41395459e676cf9ab4059e08446656f145662c2d':
Filter virtual keys after touches. (DO NOT MERGE)
Martijn Coenen [Fri, 28 Jan 2011 01:03:19 +0000 (17:03 -0800)]
am
07e6f616: Check NDEF before calling makeReadOnly().
* commit '
07e6f616d122496342a5bae51323bb218d88f7f2':
Check NDEF before calling makeReadOnly().
Nick Pelly [Fri, 28 Jan 2011 00:59:02 +0000 (16:59 -0800)]
resolved conflicts for merge of
a701cf85 to honeycomb-merge
Change-Id: I81a63599649a61fc73bf1e7ebcfed4c333903070
Mathias Agopian [Thu, 27 Jan 2011 19:24:33 +0000 (11:24 -0800)]
am
72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
* commit '
72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
Fix the ISurfaceComposer onTransact switch.
Jeff Hamilton [Thu, 27 Jan 2011 18:29:27 +0000 (12:29 -0600)]
resolved conflicts for merge of
0716ea14 to honeycomb-merge
Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421
Jeff Hamilton [Thu, 27 Jan 2011 17:27:58 +0000 (11:27 -0600)]
resolved conflicts for merge of
3a223404 to honeycomb-merge
Change-Id: I0eb1f3a271797c78d9ec5b2528a221c89973a83c
Kenny Root [Thu, 27 Jan 2011 17:18:10 +0000 (09:18 -0800)]
am
524133cc: (-s ours) Remove API that snuck into MockPackageManager
* commit '
524133cc793b5e372cc97c62653281605f57b5b3':
Remove API that snuck into MockPackageManager
Kenny Root [Thu, 27 Jan 2011 17:00:18 +0000 (09:00 -0800)]
am
34d2b41e: (-s ours) Revert "Add the {get,set}PackageObbPaths calls to API"
* commit '
34d2b41e48281d1df2c844e004740f008e699093':
Revert "Add the {get,set}PackageObbPaths calls to API"
Jeff Brown [Thu, 27 Jan 2011 16:47:18 +0000 (08:47 -0800)]
am
4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread
* commit '
4a2e478a5bf6b4650181d1dfa643eadcc387fcec':
Flush Binder commands in ndk looper.
Jeff Hamilton [Thu, 27 Jan 2011 16:44:21 +0000 (10:44 -0600)]
resolved conflicts for merge of
6687ecb4 to honeycomb-merge
Change-Id: Id9677d2ef1c03191cf73a7d90e80b57ea686afec
Nick Pelly [Thu, 27 Jan 2011 16:13:03 +0000 (08:13 -0800)]
am
b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
* commit '
b73203ab7e308b747819de2b2400afe971ef3bff':
Make sure service handles are live before passing to other objects.
James Dong [Thu, 27 Jan 2011 16:12:36 +0000 (08:12 -0800)]
am
83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
* commit '
83fdc69ea0beb715dd45f0a4285cb5d780f8018a':
Squash commits of the following patches, cherry-picked from other branch - do not merge.
Jaikumar Ganesh [Thu, 27 Jan 2011 16:12:18 +0000 (08:12 -0800)]
am
a788a943: (-s ours) Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
* commit '
a788a9430956dabbc1387e5cccc15f9f41639c95':
Do Not Merge: Expose insecure rfcomm Bluetooth API.
Dianne Hackborn [Thu, 27 Jan 2011 16:11:51 +0000 (08:11 -0800)]
am
29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread
* commit '
29c99aaaaed00c605fb6cd64de169fafad0e40ed':
Added check to make orientation calculations more robust
Dianne Hackborn [Thu, 27 Jan 2011 16:11:34 +0000 (08:11 -0800)]
am
c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread
* commit '
c058bf0043290f098fb487ee33e0da13f00134f2':
Make the Phone options dialog use current language
Kenny Root [Thu, 27 Jan 2011 05:55:56 +0000 (21:55 -0800)]
am
ea6bf362: (-s ours) Deep clone settings for system package update DO NOT MERGE
* commit '
ea6bf3628140283df24f2652b686d083b0d31ed9':
Deep clone settings for system package update DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 05:44:48 +0000 (21:44 -0800)]
am
5a40b8ef: (-s ours) Merge "Add date format and map center resources for new locales." into gingerbread
* commit '
5a40b8ef81034e00f886010c71dccd62b919028b':
Add date format and map center resources for new locales.
Jeff Hamilton [Thu, 27 Jan 2011 05:26:16 +0000 (23:26 -0600)]
resolved conflicts for merge of
52d3203e to honeycomb-merge
Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b
Wei-Ta Chen [Thu, 27 Jan 2011 05:14:34 +0000 (21:14 -0800)]
am
61d9ffbf: (-s ours) Merge "Do not merge." into gingerbread
* commit '
61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
Jeff Hamilton [Thu, 27 Jan 2011 05:09:13 +0000 (23:09 -0600)]
resolved conflicts for merge of
4330b146 to honeycomb-merge
Change-Id: I625dcf6d248ea7f6515094eae689f6550b0d6d1a
Nick Pelly [Thu, 27 Jan 2011 04:40:46 +0000 (20:40 -0800)]
am
a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '
a29bf14e1d2857debc632ce4304a1c72dded348c':
New Intent defined for RF ON/OFF events
Kenny Root [Thu, 27 Jan 2011 04:40:17 +0000 (20:40 -0800)]
am
e8c04db7: (-s ours) Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '
e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
Jaikumar Ganesh [Thu, 27 Jan 2011 00:19:55 +0000 (16:19 -0800)]
am
c8f42fb6: (-s ours) Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
* commit '
c8f42fb69867f171c04013b1b1a8f7e897ae3685':
DO NOT MERGE: Remove auto connection on ACL connection.
Eric Laurent [Thu, 27 Jan 2011 00:19:34 +0000 (16:19 -0800)]
am
bec4abaa: Merge "Fix issue
3302649." into gingerbread
* commit '
bec4abaa12bf6759f354b54119c5524cf9339e7b':
Fix issue
3302649.
Justin Ho [Thu, 27 Jan 2011 00:19:13 +0000 (16:19 -0800)]
am
7b667a0c: (-s ours) Merge "Updated flightmode assets" into gingerbread
* commit '
7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
Updated flightmode assets
Kenny Root [Wed, 26 Jan 2011 21:04:03 +0000 (13:04 -0800)]
am
6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '
6688b6c31765242866fc276cea7fa241fc5b5e7b':
Allow updated system apps to retain priority
Andreas Huber [Wed, 26 Jan 2011 19:02:10 +0000 (11:02 -0800)]
am
7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit '
7c6153606cc963191362494c8cb5669749e84326':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
Andreas Huber [Wed, 26 Jan 2011 19:01:50 +0000 (11:01 -0800)]
am
7e2f9cc8: (-s ours) DO NOT MERGE: Fix Matroska issues
* commit '
7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
Andreas Huber [Wed, 26 Jan 2011 19:01:14 +0000 (11:01 -0800)]
am
e7fbfb6b: (-s ours) Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread
* commit '
e7fbfb6b745f56eeb394785932451aa0f2aa07d9':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
Kenny Root [Wed, 26 Jan 2011 19:00:20 +0000 (11:00 -0800)]
am
91c459ec: Copy user info from PackageSetting as well
* commit '
91c459ec7dba6d56816ff5cbd92c627e0f718915':
Copy user info from PackageSetting as well
Chung-yih Wang [Wed, 26 Jan 2011 18:59:51 +0000 (10:59 -0800)]
am
65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
* commit '
65ba2c421c19fde04e6b294087a5a9c507964575':
Add auth. username in SipProfile.
Jeff Hamilton [Wed, 26 Jan 2011 17:27:51 +0000 (11:27 -0600)]
resolved conflicts for merge of
ca36d863 to honeycomb-merge
Change-Id: Idb00dc86e265b2aaed8852912e1f9d8659fd2835
Martijn Coenen [Wed, 26 Jan 2011 00:16:53 +0000 (16:16 -0800)]
am
25be5365: Implement canMakeReadonly().
* commit '
25be53652167300183282d170a00a6df576523f5':
Implement canMakeReadonly().
James Dong [Wed, 26 Jan 2011 00:16:32 +0000 (16:16 -0800)]
am
13d1cb56: (-s ours) Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
* commit '
13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
Nick Pelly [Wed, 26 Jan 2011 00:16:05 +0000 (16:16 -0800)]
am
92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '
92939376199a08fa0a3b01759579a4979c2a94a2':
Remove attemptDeadServiceRecovery() from TagTechnology's.
Nick Pelly [Wed, 26 Jan 2011 00:13:17 +0000 (16:13 -0800)]
resolved conflicts for merge of
d64d711d to honeycomb-merge
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
Dianne Hackborn [Tue, 25 Jan 2011 23:52:15 +0000 (15:52 -0800)]
am
9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
* commit '
9aac2e2b9541c424ca02483631b08949f0e90c8c':
Referencing of "r.record.name" is occured, when "r.record" is null.
Chris Tate [Tue, 25 Jan 2011 23:51:54 +0000 (15:51 -0800)]
am
bbff7ed4: (-s ours) DO NOT MERGE : Ensure that the first post-restore backup pass is correct
* commit '
bbff7ed44b353ff299b900a1ff50812a082206f0':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
Chris Tate [Tue, 25 Jan 2011 23:51:30 +0000 (15:51 -0800)]
am
6ec91731: (-s ours) DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
* commit '
6ec91731cbf6ee1a9a914d341fab9567d1599018':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
Dianne Hackborn [Tue, 25 Jan 2011 23:51:08 +0000 (15:51 -0800)]
am
433863b1: Fix issue #
3333958: Package Manager can sometimes mistakenly think...
* commit '
433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
Fix issue #
3333958: Package Manager can sometimes mistakenly think...
Dianne Hackborn [Tue, 25 Jan 2011 23:50:44 +0000 (15:50 -0800)]
am
cd23823d: Merge "Fix issue #
3227963: SecurityException: Neither user 10023 nor..." into gingerbread
* commit '
cd23823d4f533431c76baa104eb50b7803b3b391':
Scott Main [Tue, 25 Jan 2011 23:45:58 +0000 (15:45 -0800)]
am
9b447d12: (-s ours) docs: catchup gingerbread to gingerbread-docs with misc changes
* commit '
9b447d122a2f0a4798f03749e9d93b9a58834fe3':
docs: catchup gingerbread to gingerbread-docs with misc changes
Scott Main [Tue, 25 Jan 2011 23:36:41 +0000 (15:36 -0800)]
am
3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
* commit '
3d0f0108f9487512195c7344be2417c30a93c3fc':
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
Scott Main [Tue, 25 Jan 2011 23:36:17 +0000 (15:36 -0800)]
Yu Shan Emily Lau [Tue, 25 Jan 2011 23:21:41 +0000 (15:21 -0800)]
am
2af4e71d: Merge "Fix the test application orientation. Bug#
3205196" into gingerbread
* commit '
2af4e71dd47565d794ad48041a156871396a7dde':
Fix the test application orientation. Bug#
3205196
Gilles Debunne [Tue, 25 Jan 2011 23:20:38 +0000 (15:20 -0800)]
am
9ffb0a0d: (-s ours) Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
* commit '
9ffb0a0df3a97115234bd50a73ca60efcefb4ef7':
Ran fixPngMetaTags on all the core/res assets.
Gilles Debunne [Tue, 25 Jan 2011 22:58:31 +0000 (14:58 -0800)]
am
97664784: (-s ours) Merge "Asset cleanup. DO NOT MERGE" into gingerbread
* commit '
976647841cc9e52c373679c930d06d81310ff289':
Asset cleanup. DO NOT MERGE
Marco Nelissen [Tue, 25 Jan 2011 22:58:08 +0000 (14:58 -0800)]
am
f13d4501: (-s ours) Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/
3311831
* commit '
f13d4501396aa1679004ad07d440f65ced3ecc2b':
Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/
3311831
Mathias Agopian [Tue, 25 Jan 2011 22:43:05 +0000 (14:43 -0800)]
Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:42:59 +0000 (14:42 -0800)]
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
Jeff Hamilton [Tue, 25 Jan 2011 22:35:46 +0000 (14:35 -0800)]
Merge "Use classnames instead of ints for NFC techs." into gingerbread
Jeff Hamilton [Mon, 24 Jan 2011 20:53:00 +0000 (14:53 -0600)]
Use classnames instead of ints for NFC techs.
This makes the system more flexible and allows
adding new technology types without having to
update the API.
Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
Mathias Agopian [Wed, 15 Dec 2010 22:41:59 +0000 (14:41 -0800)]
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
we make sure to call compositionComplete after everytime we do
composition with the GPU (even for the screenshot case), which is
where the buffer locks are released.
Change-Id: I450430d1e4d1ee9ce1023970642378c42cdcfa4c
Mathias Agopian [Tue, 14 Dec 2010 00:47:31 +0000 (16:47 -0800)]
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
Marco Nelissen [Tue, 25 Jan 2011 20:51:41 +0000 (12:51 -0800)]
am
ba77a3f9: (-s ours) Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/
3311831
* commit '
ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/
3311831
Nick Pelly [Tue, 25 Jan 2011 20:39:25 +0000 (12:39 -0800)]
am
f54ad8da: Clean up transceive().
* commit '
f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
Clean up transceive().
Eric Fischer [Tue, 25 Jan 2011 20:39:03 +0000 (12:39 -0800)]
am
06d19ef0: (-s ours) Merge "Import translations for additional languages." into gingerbread
* commit '
06d19ef0a0f29d9a0bec63097ec443815512e9b1':
Import translations for additional languages.
Jeff Hamilton [Tue, 25 Jan 2011 20:35:55 +0000 (14:35 -0600)]
resolved conflicts for merge of
0aea1836 to honeycomb-merge
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
Dianne Hackborn [Tue, 25 Jan 2011 18:45:33 +0000 (10:45 -0800)]
am
3ea5728e: Tweak level at which we reset battery stats to 90%.
* commit '
3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
Tweak level at which we reset battery stats to 90%.
Marco Nelissen [Tue, 25 Jan 2011 18:06:16 +0000 (10:06 -0800)]
Merge "Increase the number of useful bits in the spectrum." into gingerbread
Nick Pelly [Tue, 25 Jan 2011 15:45:07 +0000 (07:45 -0800)]
Make Mifare Classic increment/decrement operands little endian
Also make sure they are non-negative.
This is not documented in Mifare Classic spec, but based on findings from NXP:
- Operand should be stored in little-endian format in the transceive buffer
- Tag ignores the sign bit on the operand, its effectively 31-bit unsigned
- Overflow and underflow generates an error.
Change-Id: Id3389b3894ded732c4b00d564ca53f5df651359e
Hung-ying Tyan [Tue, 25 Jan 2011 05:13:08 +0000 (21:13 -0800)]
Merge "Get mute state from active call." into gingerbread