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

67161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
119323a58c am 59d46b06: Merge "Add an api to switch to the next IME and subtype" 
* commit '59d46b06653b5f55c2f26d3ff8d642ffda0cecd8':
  Add an api to switch to the next IME and subtype
 2012-02-10 02:25:02 -08:00
satok
59d46b0665 Merge "Add an api to switch to the next IME and subtype" 2012-02-10 02:22:57 -08:00
James Dong
6908dd7175 am 55ee8415: Merge "move away from MediaDebug and use ADebug instead for video editor engine" 
* commit '55ee84154b3afe07afef6311f707928856840f89':
  move away from MediaDebug and use ADebug instead for video editor engine
 2012-02-09 23:55:45 -08:00
James Dong
55ee84154b Merge "move away from MediaDebug and use ADebug instead for video editor engine" 2012-02-09 23:53:50 -08:00
James Dong
459f40dfb3 move away from MediaDebug and use ADebug instead for video editor engine 
Change-Id: I2c0ad6c64f1bd03bd3dfe2c87792f8089dcbc101
 2012-02-09 23:52:19 -08:00
satok
688bd47fcc Add an api to switch to the next IME and subtype 
Bug: 5975302

Change-Id: I48aa4220159c65f456d61a324efcdf0a1ceec91c
 2012-02-10 16:44:12 +09:00
Scott Main
7a6be7b33d am 59adf8a1: am b45087bf: am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit '59adf8a1019724e556f86957aba489e1fee5454d':
 2012-02-09 21:11:02 -08:00
Joe Fernandez
9386f654c7 am f1908925: am d2deae8f: am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit 'f19089259ecd6627cd4703ab55b5df8a4f4644a7':
 2012-02-09 21:11:00 -08:00
Scott Main
627b928c69 am 6b9f68ac: am 758fe151: am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '6b9f68ac89615505ac24f8c00d3fddc4ff43b58b':
 2012-02-09 21:10:57 -08:00
Scott Main
59adf8a101 am b45087bf: am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'b45087bf09921dd515e83804d821f127d8b790c6':
 2012-02-09 21:09:01 -08:00
Joe Fernandez
f19089259e am d2deae8f: am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit 'd2deae8f40d33ad69d92963a7fceb90ee3cae1ad':
 2012-02-09 21:08:59 -08:00
Scott Main
6b9f68ac89 am 758fe151: am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '758fe1511e499099deddcb94994b5d9a332062e1':
 2012-02-09 21:08:58 -08:00
Scott Main
b45087bf09 am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit '98c313340a46401adda86b398a7623f39aa8e412':
 2012-02-09 21:07:10 -08:00
Joe Fernandez
d2deae8f40 am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit 'a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':
 2012-02-09 21:07:08 -08:00
Scott Main
758fe1511e am cf18f420: am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit 'cf18f42026b6dea9e1ec2f243718a6b7aebae3a2':
 2012-02-09 21:07:08 -08:00
Dianne Hackborn
887ffbea90 am d10035d5: Merge "Some hardening of isolated processes by restricting access to services." 
* commit 'd10035d52bcd4eed9f83cad580d606cd522dd6c7':
  Some hardening of isolated processes by restricting access to services.
 2012-02-09 18:10:48 -08:00
Dianne Hackborn
d10035d52b Merge "Some hardening of isolated processes by restricting access to services." 2012-02-09 18:08:38 -08:00
Dianne Hackborn
a573f6a1d9 Some hardening of isolated processes by restricting access to services. 
Services now must explicitly opt in to being accessed by isolated
processes.  Currently only the activity manager and surface flinger
allow this.  Activity manager is needed so that we can actually
bring up the process; SurfaceFlinger is needed to be able to get the
display information for creating the Configuration.  The SurfaceFlinger
should be safe because the app doesn't have access to the window
manager so can't actually get a surface to do anything with.

The activity manager now protects most of its entry points against
isolated processes.

Change-Id: I0dad8cb2c873575c4c7659c3c2a7eda8e98f46b0
 2012-02-09 18:06:01 -08:00
Fabrice Di Meglio
29cbd81b4b am 8bb8dc9b: Merge "Update BiDiTests app" 
* commit '8bb8dc9b5f67d6c82d18da4ea46053ea80b75c84':
  Update BiDiTests app
 2012-02-09 17:36:41 -08:00
Fabrice Di Meglio
8bb8dc9b5f Merge "Update BiDiTests app" 2012-02-09 17:35:21 -08:00
Fabrice Di Meglio
2a7e7a08d9 Update BiDiTests app 
- add more unit tests for GridLayout (layout created by code)

Change-Id: I462c41a7c5bdcb6c5d3762570f5d415cc0fa0bde
 2012-02-09 17:32:24 -08:00
Scott Main
62156579b5 am 9c81154d: am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit '9c81154dfe88e7f94bd2a3359e035185722fcefe':
  docs: fix xss issue bug 5125642
 2012-02-09 16:08:36 -08:00
Scott Main
9c81154dfe am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'ad231a303ee8fe7f8b51900d7b57971ab9963ad4':
  docs: fix xss issue bug 5125642
 2012-02-09 16:06:31 -08:00
Scott Main
ad231a303e am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'db7da7ee40231225861f4d39ea2f256bbca06f24':
  docs: fix xss issue bug 5125642
 2012-02-09 16:04:15 -08:00
Scott Main
db7da7ee40 am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
 2012-02-09 16:01:51 -08:00
Scott Main
98c313340a am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
 2012-02-09 16:01:38 -08:00
Scott Main
d9c8bbd56a docs: fix xss issue 
bug 5125642

Change-Id: I326b619643e3b3de20aa9303e92c9218fdfe50f7
 2012-02-09 15:57:09 -08:00
James Dong
3baf2bec76 am 4f0106cc: Merge "Finish up B frame support in MPEG4Writer" 
* commit '4f0106cca0c40cd506367c894436f91c4920a5e1':
  Finish up B frame support in MPEG4Writer
 2012-02-09 15:24:32 -08:00
James Dong
4f0106cca0 Merge "Finish up B frame support in MPEG4Writer" 2012-02-09 15:22:58 -08:00
Jason Sams
206904b2af am 468a9715: Merge "Remove unused param." 
* commit '468a971512f4665b13e83cc3c7dc24c9031b14eb':
  Remove unused param.
 2012-02-09 15:19:10 -08:00
Jason Sams
468a971512 Merge "Remove unused param." 2012-02-09 15:17:27 -08:00
James Dong
9975229a73 Finish up B frame support in MPEG4Writer 
o optimize to reduce the size of the size of the ctts box
o change the type for the time offset field in ctts table entry from int32_t to uint32_t according to the mp4 file spec
o also moved away from MediaDebug and used ADebug instead.

o related-to-bug: 4232183

Change-Id: I19364303728da64359c63169eec7487508c1d0f8
 2012-02-09 15:02:08 -08:00
Andreas Huber
146e4768e9 am 8f0f10a8: Merge "Experiment with seeking to closest frame instead of closest syncframe" 
* commit '8f0f10a80a89b2071b949f13ac6ff23514366d23':
  Experiment with seeking to closest frame instead of closest syncframe
 2012-02-09 14:54:58 -08:00
Andreas Huber
8f0f10a80a Merge "Experiment with seeking to closest frame instead of closest syncframe" 2012-02-09 14:52:58 -08:00
Jason Sams
87e2721f89 Remove unused param. 
Change-Id: Idf26c3bf4eec7ed17dbfb99b40c314bce7996101
 2012-02-09 14:50:50 -08:00
Andreas Huber
713f90f3ca Experiment with seeking to closest frame instead of closest syncframe 
Also supports SEEK_CLOSEST mode in the Matroska/Webm extractor.

Change-Id: I257771648dfe41392a4cf8932f625489dcb9f234
 2012-02-09 14:32:08 -08:00
Joe Fernandez
1a4f18b81a am f4aaf1f5: am 4f21e3a0: am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit 'f4aaf1f56247289838f4bb25ee704196464be4f2':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:53:42 -08:00
Joe Fernandez
f4aaf1f562 am 4f21e3a0: am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit '4f21e3a08adefbb5e109e2f844386ed844c1c436':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:51:00 -08:00
Joe Fernandez
4f21e3a08a am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:48:46 -08:00
Joe Fernandez
a300ea98df am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:46:55 -08:00
Joe Fernandez
20b9c795d4 am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
 2012-02-09 13:46:41 -08:00
Joe Fernandez
1c66faab73 Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 2012-02-09 13:45:01 -08:00
Scott Main
ee345428b8 am e7eeace5: am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit 'e7eeace594861365b4b5de08eee2cb4c0abf06b2':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:55:36 -08:00
Scott Main
e7eeace594 am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit 'ec12ae9933e463181338834387caa7c58b330635':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:53:12 -08:00
Scott Main
ec12ae9933 am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:50:18 -08:00
Scott Main
cf18f42026 am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:48:18 -08:00
Scott Main
79cfde69fd am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:48:08 -08:00
Scott Main
52bfc24368 docs: fix misc doc bugs from external issue tracker 
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
 2012-02-09 12:45:16 -08:00
Eric Fischer
1633bd9c74 am 48e1b91b: Merge "Import translations. DO NOT MERGE" 
* commit '48e1b91b36a47b39c2317a9fd595799dcf92b844':
  Import translations. DO NOT MERGE
 2012-02-09 11:38:54 -08:00
Eric Fischer
48e1b91b36 Merge "Import translations. DO NOT MERGE" 2012-02-09 11:37:18 -08:00