ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
16,958 Commits 2 Branches 0 Tags 54 MiB
67c4219aa3
Commit Graph

16958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
a40e97e159 am 8d0e37f5: Merge "docs: revise platform intro" into froyo 
Merge commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp

* commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f':
  docs: revise platform intro
 2010-05-19 12:09:04 -07:00
Scott Main
0c113f694c Merge "docs: revise platform intro" into froyo 2010-05-19 12:05:52 -07:00
The Android Open Source Project
02ce4d819f am 6af002b7: am b32a74c7: am ee1cdd0e: merge from open-source master 2010-05-19 09:45:51 -07:00
The Android Open Source Project
4f21ab4ac1 am b32a74c7: am ee1cdd0e: merge from open-source master 2010-05-19 09:44:20 -07:00
The Android Open Source Project
7e8b8d4e9c am ee1cdd0e: merge from open-source master 
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken

* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
  Don't allow invalid Uris to be added as observers.
 2010-05-19 09:43:20 -07:00
The Android Open Source Project
3aafcabfad am 09603c03: am 37b0da26: am 2b544c9f: merge from open-source master 2010-05-19 09:41:02 -07:00
The Android Open Source Project
3999a2a06f am 37b0da26: am 2b544c9f: merge from open-source master 2010-05-19 09:39:29 -07:00
The Android Open Source Project
240b23aafd 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
7f3af556d7 merge from open-source master 
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
 2010-05-19 09:36:55 -07:00
The Android Open Source Project
5a14150771 merge from open-source master 
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
 2010-05-19 09:32:44 -07:00
The Android Open Source Project
24fc3581e5 am e23c404a: am bea97a89: am 2dc7c6c4: merge from open-source master 2010-05-19 09:26:24 -07:00
The Android Open Source Project
cbaf2265e1 am bea97a89: am 2dc7c6c4: merge from open-source master 2010-05-19 09:24:37 -07:00
The Android Open Source Project
29c733110a 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
5b417743a5 merge from open-source master 
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
 2010-05-19 09:20:22 -07:00
Romain Guy
f3998f6abc Merge "Don't allow invalid Uris to be added as observers." 2010-05-19 09:03:57 -07:00
The Android Open Source Project
58cb0e37d7 am 34b1c116: am b39b0f32: am faf9a783: merge from open-source master 2010-05-19 08:44:59 -07:00
The Android Open Source Project
c53dfb80b0 am b39b0f32: am faf9a783: merge from open-source master 2010-05-19 08:43:14 -07:00
The Android Open Source Project
3d8ba4a265 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
f6dce582f6 merge from open-source master 
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
 2010-05-19 08:39:13 -07:00
The Android Open Source Project
7795d9e558 am 56d4bcd8: am 627356ce: am d6c0bb0f: merge from open-source master 2010-05-19 08:36:58 -07:00
Jean-Baptiste Queru
ed02950ce1 Merge "Fix isssue 2548710: Native AudioTrack resources never freed." 2010-05-19 08:35:21 -07:00
The Android Open Source Project
920171af9d am 627356ce: am d6c0bb0f: merge from open-source master 2010-05-19 08:35:16 -07:00
The Android Open Source Project
f960b89512 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
ba7eb7398b merge from open-source master 
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
 2010-05-19 08:28:32 -07:00
The Android Open Source Project
d4f11bbfbf am 6e7cad67: am 0b6defef: am aa2fe148: merge from open-source master 2010-05-19 08:25:30 -07:00
The Android Open Source Project
070438c8d6 am 0b6defef: am aa2fe148: merge from open-source master 2010-05-19 08:23:46 -07:00
The Android Open Source Project
4ee7e49544 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
1c03f554f1 merge from open-source master 
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
 2010-05-19 08:15:54 -07:00
Romain Guy
39ced7d0b7 Merge "Add and document .nomedia constant for MediaStore (Issue 6365)" 2010-05-19 00:03:34 -07:00
Romain Guy
a49307b993 Merge "Text disappears when selecting text in text editor." 2010-05-19 00:01:55 -07:00
Romain Guy
d93fe7c0ea Merge "Removed Calls to deprecated APIs" 2010-05-19 00:01:02 -07:00
Romain Guy
bcb72f9af7 Merge "Improved error handling when font loading fails." 2010-05-18 23:51:16 -07:00
Guang Zhu
8b430e370a 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
14d6c9f1b6 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
8923143818 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
d51b61e16e am 97f8b171: Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken 2010-05-18 18:35:31 -07:00
Guang Zhu
30238da1f5 Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken 2010-05-18 18:33:35 -07:00
Guang Zhu
b31ec1d2d5 Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken 2010-05-18 18:33:30 -07:00
Dianne Hackborn
54280bae23 am 4a30bcf7: am 74323fd1: Update NativeActivity to allow direct surface access. 2010-05-18 18:28:57 -07:00
Suchi Amalapurapu
9dba5ef33f 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
64c665c557 am 13da084d: am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 2010-05-18 18:27:50 -07:00
Suchi Amalapurapu
6d3e02ef3c 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
76b783429a am 634e9a12: am 54525412: am 3aecdb9d: merge from open-source master 2010-05-18 18:27:18 -07:00
Dianne Hackborn
e439ecdd8b am 74323fd1: Update NativeActivity to allow direct surface access. 2010-05-18 18:23:47 -07:00
Dianne Hackborn
5fb05853b9 resolved conflicts for merge of 8b625a95 to master 
Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba
 2010-05-18 18:21:07 -07:00
Jason Sams
c30b3a381e Merge "Split ScriptC Lib into CL, GL, and basic." 2010-05-18 16:04:21 -07:00
Suchi Amalapurapu
b2c74ffd6a 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
d4e1887f82 am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 2010-05-18 14:56:09 -07:00
Suchi Amalapurapu
503fd99039 am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken

* commit '7361b7410f2427022cc8917b00553dc26107cded':
  Uncomment a test that was marked as STOPSHIP
 2010-05-18 14:55:48 -07:00
Jaikumar Ganesh
77ee720aad am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 
Merge commit 'ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken

* commit 'ea6f6755ce15133238938bd9626b69e5f655a49c':
  Removing STOPSHIP logs.
 2010-05-18 14:53:39 -07:00