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

41126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
a8d5dbbccd am 226e5756: (-s ours) Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-29 11:00:28 -08:00
Jean-Baptiste Queru
0044b4ad6a Merge d350dc04 from gingerbread 
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
 2011-01-29 10:57:48 -08:00
Eric Fischer
355f66917d am 3d73c4d3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
  Import revised translations.  DO NOT MERGE
 2011-01-29 10:40:17 -08:00
Nick Pelly
4226be3f04 am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-29 10:40:07 -08:00
Scott Main
f067fbfe0c am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread 
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
 2011-01-29 10:40:01 -08:00
Jean-Baptiste Queru
0440cc1fb7 Merge eab0e97b from gingerbread 
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
 2011-01-29 10:38:09 -08:00
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
satok
e40dea0d06 Fix a bug that IME switch disappiers at switching IME subtype. 
Bug: 3404788

Change-Id: I741642ac690a1b4c6ca1225ee271bffe39164170
 2011-01-30 02:03:48 +09: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
Robert Greenwalt
6b739dc729 Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Robert Greenwalt
19eecb028f Merge "Don't use mobile networktype icon if not connected" into honeycomb 2011-01-29 06:35:57 -08:00
Justin Ho
9b1df1646f Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 2011-01-28 22:51:51 -08:00
Justin Ho
35326b876e Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style 
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
 2011-01-28 22:49:43 -08:00
Jeff Brown
2992ea782f Add "Use physical keyboard" option to system bar IME button. 
Bug: 3391067
Change-Id: I136087ca4f726d0068d5983d7d3686787ba60c55
 2011-01-28 22:06:36 -08:00
Justin Ho
9371f70300 Merge "New honeycomb sound set" into honeycomb 2011-01-28 19:18:51 -08:00
Justin Ho
5f3bbcf554 New honeycomb sound set 
Change-Id: Iaf3062f57f613702ea946fdf65e02f6265342ad5
 2011-01-28 19:15:23 -08:00
Joe Onorato
a0f2cdb507 Merge "999" into honeycomb 2011-01-28 18:47:57 -08:00
Joe Onorato
c6925ca684 999 
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
 2011-01-28 18:46:20 -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
Mathias Agopian
231da079c9 Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb 2011-01-28 18:38:58 -08:00
Mathias Agopian
1723b049c6 fix [3389263] OMX.Nvidia.h264.decode fails to shutdown 
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.

Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
 2011-01-28 18:23:24 -08:00