drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,563 Commits 1 Branch 0 Tags
Commit Graph

40563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
df346d8a78 am 89a54408: (-s ours) Merge "Update networktype before sending state change." into gingerbread 
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
  Update networktype before sending state change.
 2011-01-29 10:26:33 -08:00
Dirk Dougherty
50d7d52810 am 591a5f86: Doc change: fix adt archive filename. 
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
  Doc change: fix adt archive filename.
 2011-01-29 10:16:14 -08:00
Jean-Baptiste Queru
ef1cf4b416 Merge ba3dd323 from gingerbread 
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
 2011-01-29 10:11:06 -08:00
Scott Main
4feebc2c7d am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
 2011-01-29 09:59:33 -08:00
Andreas Huber
9df3861ccb am 2dce338e: (-s ours) DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. 
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
  DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-29 09:55:13 -08:00
Dianne Hackborn
1ac4f38dfa am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread 
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
  Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
 2011-01-29 09:54:53 -08:00
Jean-Michel Trivi
aaa814c4a8 am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master 
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
  do not merge bug 3370834 Cherrypick from master
 2011-01-29 09:54:41 -08:00
Kenny Root
c68a657f12 am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
 2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
593dadd683 Merge c33acae9 from gingerbread 
Change-Id: I52b5045cbef6e4927f86830498050977b2829859
 2011-01-29 09:45:41 -08:00
Mathias Agopian
5af18cbf57 am 239fd805: (-s ours) Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread 
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
 2011-01-29 09:40:51 -08:00
Mathias Agopian
27667d808e am 1955a5c9: (-s ours) Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread 
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
  partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
 2011-01-29 09:40:34 -08:00
Mathias Agopian
58da4d30a3 am d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread 
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
  fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
 2011-01-29 09:40:25 -08:00
Mathias Agopian
87c9dee034 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)
 2011-01-29 09:40:14 -08:00
Mathias Agopian
8dc246ece5 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)
 2011-01-29 09:40:06 -08:00
Jean-Baptiste Queru
962d556a12 Merge f126ad3b from gingerbread 
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
 2011-01-29 09:37:44 -08:00
Marco Nelissen
cc2915c0b1 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.
 2011-01-29 09:32:05 -08:00
Nick Pelly
1ac6d08a05 am b134223f: Make Mifare Classic increment/decrement operands little endian 
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
 2011-01-29 09:31:56 -08:00
Hung-ying Tyan
dd75788eda am cc019c0c: Merge "Get mute state from active call." into gingerbread 
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
  Get mute state from active call.
 2011-01-29 09:31:40 -08:00
Hung-ying Tyan
7b2ca23262 am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread 
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
 2011-01-29 09:31:19 -08:00
Jeff Brown
3e18ef5ffe am d8bdc06f: (-s ours) Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE) 
* commit 'd8bdc06f8139231f1edc1a8bf22b637ebb790605':
  Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
 2011-01-29 09:27:55 -08:00
Andreas Huber
d7e5669409 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
 2011-01-29 07:30:57 -08:00
Justin Ho
4379dac6b0 am 28c4f69a: Updated checkbox assets 
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
  Updated checkbox assets
 2011-01-29 07:30:39 -08:00
Arnaud Ferir
c5e35fd246 am 5e81a6e2: Fix trace mismatch. 
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
 2011-01-29 07:30:07 -08:00
Sylvain Fonteneau
addd46c658 am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel. 
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
 2011-01-29 07:29:56 -08:00
John Wang
6630698e24 am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread 
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
  Enable recovery in RIL wakelock release check.
 2011-01-29 07:29:42 -08:00
Jean-Baptiste Queru
86e1c5b9f6 Merge c896d85c from gingerbread 
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
 2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
ac983353e6 Merge da01b4ab from gingerbread 
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
 2011-01-29 07:17:22 -08:00
Jeff Hamilton
6d904e7039 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.
 2011-01-29 07:09:21 -08:00
Jim Miller
4485edce05 am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. 
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
 2011-01-29 07:08:58 -08:00
Jaikumar Ganesh
e741e5400e 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.
 2011-01-28 18:45:14 -08:00
John Reck
4d03f646b4 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
 2011-01-28 18:44:57 -08:00
Jeff Hamilton
df5d015ae2 resolved conflicts for merge of dc54a8c7 to honeycomb-merge 
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
 2011-01-28 20:41:42 -06:00
Jean-Michel Trivi
0d9209784a 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
 2011-01-28 17:37:12 -08:00
Jeff Hamilton
dac3063adb resolved conflicts for merge of a314f32b to honeycomb-merge 
Change-Id: I98d37ee8666d9d3f195d2b23d50dc851f1ef6500
 2011-01-28 13:16:46 -08:00
Eric Laurent
d1fda43ed7 am c5694ebd: (-s ours) Merge "do not merge - Fix issue 3371096." into gingerbread 
* commit 'c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
  do not merge - Fix issue 3371096.
 2011-01-27 21:21:04 -08:00
Dianne Hackborn
fd9e6acd86 am 11576102: (-s ours) Fix issue #3373438: Update GBMR versions 
* commit '11576102a9794ef964a08bc372dc09803f58997a':
  Fix issue #3373438: Update GBMR versions
 2011-01-27 19:57:58 -08:00
Dave Sparks
0a6f765207 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.
 2011-01-27 19:49:59 -08:00
Mathias Agopian
16a9b29126 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
 2011-01-27 19:49:40 -08:00
Jeff Brown
fdbc3f7cdb 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)
 2011-01-27 19:41:07 -08:00
Mathias Agopian
570137a2b1 am a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread 
* commit 'a0bafb471385767f7c9c91efe7fd828b069b2e97':
  Use EGL_NATIVE_VISUAL_ID to select EGLConfig
 2011-01-27 18:39:21 -08:00
Andreas Huber
3a224ecaba 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"
 2011-01-27 18:38:21 -08:00
Nick Pelly
2478e617c4 resolved conflicts for merge of b7d6ffd7 to honeycomb-merge 
Change-Id: If5553e0b51513687c4012600d92323617190fb6c
 2011-01-27 18:35:19 -08:00
Nick Pelly
51ee9c1367 am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread 
* commit '50d0bcb45beb30746271b620ab23ad4d69fd9d5b':
  Support for TagLostException (API).
 2011-01-27 18:29:13 -08:00
Brad Fitzpatrick
0613ee5afb am 597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread 
* commit '597fa828fa2b3cba053f0afeeac877b1ee2d24b7':
  Watchdog can get deadlocked on activity manager
 2011-01-27 18:28:54 -08:00
Nick Pelly
4990b515c8 am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread 
* commit 'b735aa0b6fabb72097191923d8787b43fa52531e':
  Fix javadoc which broke build.
 2011-01-27 18:28:25 -08:00
Eric Laurent
a03ebe9851 resolved conflicts for merge of 00118a48 to honeycomb-merge 
Change-Id: I27d24fb00e36bdaadbdf646bb8bf7b5639556369
 2011-01-27 18:25:32 -08:00
Nick Pelly
16fad45bb5 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).
 2011-01-27 17:29:59 -08:00
Mathias Agopian
14f3d86267 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
 2011-01-27 17:28:47 -08:00
Amith Yamasani
b0f6766bcc 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.
 2011-01-27 17:28:31 -08:00
Irfan Sheriff
08643095a1 am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread 
* commit '4170b46329ed91e81cf22dba82e2dadc326b3e3d':
  Do not add unsolicited events to queue
 2011-01-27 17:04:07 -08:00