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

24355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
b3f4e15725 am 09603c03: am 37b0da26: am 2b544c9f: merge from open-source master 2010-05-19 09:41:02 -07:00
The Android Open Source Project
09603c0339 am 37b0da26: am 2b544c9f: merge from open-source master 2010-05-19 09:39:29 -07:00
Mike Lockwood
5bae7f615b More work on PTP host support. 
Change-Id: Ifbd5bd5efa3cdb750ae1a2aae38181457554d34d
Signed-off-by: Mike Lockwood <mike@spruce.(none)>
 2010-05-19 12:38:03 -04:00
The Android Open Source Project
37b0da26fc am 2b544c9f: merge from open-source master 
Merge commit '2b544c9f0ea139d052664be0be465c2315707081' into kraken

* commit '2b544c9f0ea139d052664be0be465c2315707081':
  Fix isssue 2548710: Native AudioTrack resources never freed.
 2010-05-19 09:37:21 -07:00
The Android Open Source Project
ee1cdd0e60 merge from open-source master 
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
 2010-05-19 09:36:55 -07:00
The Android Open Source Project
2b544c9f0e merge from open-source master 
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
 2010-05-19 09:32:44 -07:00
The Android Open Source Project
ec4eff80cd am e23c404a: am bea97a89: am 2dc7c6c4: merge from open-source master 2010-05-19 09:26:24 -07:00
The Android Open Source Project
e23c404a70 am bea97a89: am 2dc7c6c4: merge from open-source master 2010-05-19 09:24:37 -07:00
The Android Open Source Project
bea97a897b am 2dc7c6c4: merge from open-source master 
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken

* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
  Add and document .nomedia constant for MediaStore (Issue 6365)
 2010-05-19 09:22:21 -07:00
The Android Open Source Project
2dc7c6c415 merge from open-source master 
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
 2010-05-19 09:20:22 -07:00
Wink Saville
a4f3bec29c Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage. 
The EBNF statemachine description language was to difficult
to remember changed to use a simpler and more obvious psuedo
language.

Added HANDLED and NOT_HANDLED as it makes the psuedo code
more obvious.

Added getCurrentMessage primarily for use by code in enter
so that it can know why the new state is being entered.

Change-Id: I1446e417b77684fbde0020b1da0975eedc57cce4
 2010-05-19 09:11:38 -07:00
Romain Guy
bcb62f099a Merge "Don't allow invalid Uris to be added as observers." 2010-05-19 09:03:57 -07:00
The Android Open Source Project
75095f693a am 34b1c116: am b39b0f32: am faf9a783: merge from open-source master 2010-05-19 08:44:59 -07:00
The Android Open Source Project
34b1c11689 am b39b0f32: am faf9a783: merge from open-source master 2010-05-19 08:43:14 -07:00
The Android Open Source Project
b39b0f32d1 am faf9a783: merge from open-source master 
Merge commit 'faf9a78363b0c773b95c9b43263d788aee313054' into kraken

* commit 'faf9a78363b0c773b95c9b43263d788aee313054':
  Text disappears when selecting text in text editor.
 2010-05-19 08:41:26 -07:00
The Android Open Source Project
faf9a78363 merge from open-source master 
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
 2010-05-19 08:39:13 -07:00
The Android Open Source Project
39ccc0811f am 56d4bcd8: am 627356ce: am d6c0bb0f: merge from open-source master 2010-05-19 08:36:58 -07:00
Jean-Baptiste Queru
a3e7645514 Merge "Fix isssue 2548710: Native AudioTrack resources never freed." 2010-05-19 08:35:21 -07:00
The Android Open Source Project
56d4bcd85c am 627356ce: am d6c0bb0f: merge from open-source master 2010-05-19 08:35:16 -07:00
The Android Open Source Project
627356cee4 am d6c0bb0f: merge from open-source master 
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken

* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
  Removed Calls to deprecated APIs
 2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f merge from open-source master 
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
 2010-05-19 08:28:32 -07:00
The Android Open Source Project
1dab0e4355 am 6e7cad67: am 0b6defef: am aa2fe148: merge from open-source master 2010-05-19 08:25:30 -07:00
The Android Open Source Project
6e7cad67a9 am 0b6defef: am aa2fe148: merge from open-source master 2010-05-19 08:23:46 -07:00
The Android Open Source Project
0b6defefb9 am aa2fe148: merge from open-source master 
Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken

* commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934':
  Improved error handling when font loading fails.
 2010-05-19 08:21:54 -07:00
The Android Open Source Project
aa2fe14849 merge from open-source master 
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
 2010-05-19 08:15:54 -07:00
James Dong
17299ab50c Initial software encoder checkins 
Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
 2010-05-19 07:21:25 -07:00
Anthony Newnam
f51266471c Don't allow invalid Uris to be added as observers. 
If a null segment is added, it will cause problems traversing the list
at a later point.

Change-Id: I5aa97b969cac7231e214168af7d3263b1c16f0a0
 2010-05-19 07:39:07 -05:00
Romain Guy
e02a63f012 Merge "Add and document .nomedia constant for MediaStore (Issue 6365)" 2010-05-19 00:03:34 -07:00
Romain Guy
7a029da6d6 Merge "Text disappears when selecting text in text editor." 2010-05-19 00:01:55 -07:00
Romain Guy
2b9a49a30d Merge "Removed Calls to deprecated APIs" 2010-05-19 00:01:02 -07:00
Romain Guy
38581c9d1d Merge "Improved error handling when font loading fails." 2010-05-18 23:51:16 -07:00
Guang Zhu
b350d3b718 am b990f4f4: (-s ours) am 984680ba: Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken 2010-05-18 18:37:42 -07:00
Guang Zhu
0f534e5ddc am dad33bbd: (-s ours) am 97f8b171: Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken 2010-05-18 18:37:38 -07:00
Guang Zhu
b990f4f434 am 984680ba: Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken 2010-05-18 18:35:35 -07:00
Guang Zhu
dad33bbd9e am 97f8b171: Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken 2010-05-18 18:35:31 -07:00
Guang Zhu
984680baff Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken 2010-05-18 18:33:35 -07:00
Guang Zhu
97f8b171f1 Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken 2010-05-18 18:33:30 -07:00
Dianne Hackborn
b269735ca0 am 4a30bcf7: am 74323fd1: Update NativeActivity to allow direct surface access. 2010-05-18 18:28:57 -07:00
Suchi Amalapurapu
d7289efbad am 2be883c4: am 4ec730ca: am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 2010-05-18 18:27:56 -07:00
Jaikumar Ganesh
2e096c232c am 13da084d: am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 2010-05-18 18:27:50 -07:00
Suchi Amalapurapu
6211c5690c am 5f0e438b: am 3d802ef7: am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well. 2010-05-18 18:27:28 -07:00
The Android Open Source Project
cae1bfd266 am 634e9a12: am 54525412: am 3aecdb9d: merge from open-source master 2010-05-18 18:27:18 -07:00
Dianne Hackborn
4a30bcf7d1 am 74323fd1: Update NativeActivity to allow direct surface access. 2010-05-18 18:23:47 -07:00
Dianne Hackborn
9b081a809a resolved conflicts for merge of 8b625a95 to master 
Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba
 2010-05-18 18:21:07 -07:00
Dianne Hackborn
74323fd1ab Update NativeActivity to allow direct surface access. 
No actual native API for using a surface, but it's a step.

Change-Id: I627f26b705abc7a05edf9117411abfacf0fae64a
 2010-05-18 18:16:35 -07:00
Guang Zhu
f1f9fcdbe9 add execution permission to "input" script (DO NOT MERGE) 
Although when building system image, "input" script will be given execution
permission, adb sync will push a version without x onto device from build
tree. Refer to frameworks/base/cmds/svc/svc, which has execution bit set.

Change-Id: Ie82df2f0d3150c3df9498399f2c446f07ea89ca5
 2010-05-18 16:07:16 -07:00
Jason Sams
db3be83ac6 Merge "Split ScriptC Lib into CL, GL, and basic." 2010-05-18 16:04:21 -07:00
Guang Zhu
864feb8dfa disable emma instrumentation for framework, ext and services (DO NOT MERGE) 
When these libraries are instrumented with emma instructions, runtime keeps
restarting on native crashes. To acheive a fully emma instrumented build,
we need to disable emma instrumentation on these libraries.

Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670
 2010-05-18 16:02:28 -07:00
Suchi Amalapurapu
2be883c4b1 am 4ec730ca: am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 2010-05-18 14:57:54 -07:00
Jaikumar Ganesh
13da084da8 am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 2010-05-18 14:56:09 -07:00