ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
15,685 Commits 2 Branches 0 Tags 54 MiB
e839a589bf
Commit Graph

15685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
417a858c31 am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo 
Merge commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken

* commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac':
  docs: add youtube video to highlights
 2010-05-19 20:27:21 -07:00
Scott Main
6beef8e2d8 am 55f383a9: Merge "docs: add youtube video to highlights" into froyo 
Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp

* commit '55f383a9b8da99aa48857fea27a35badc515d8bd':
  docs: add youtube video to highlights
 2010-05-19 20:25:15 -07:00
Scott Main
98ca2ec913 Merge "docs: add youtube video to highlights" into froyo 2010-05-19 20:24:18 -07:00
Scott Main
4701e1be98 am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo 
Merge commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken

* commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926':
  doc: add developing and testing info to backup guide
 2010-05-19 19:32:25 -07:00
Scott Main
540070ae0d am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo 
Merge commit '8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp

* commit '8025989957e5b6ad51e99a69a0e1e753e40cba67':
  doc: add developing and testing info to backup guide
 2010-05-19 19:30:29 -07:00
Scott Main
ee85a0abcb Merge "doc: add developing and testing info to backup guide" into froyo 2010-05-19 19:29:19 -07:00
Dirk Dougherty
4caf488b34 am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc. 
Merge commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07' into kraken

* commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07':
  Doc change: Move framework api change info higher in platform notes documents.
 2010-05-19 18:59:57 -07:00
Dirk Dougherty
66578db683 am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc. 
Merge commit '44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp

* commit '44108b54543c87e2c46a6d5d4339b3c4e06373de':
  Doc change: Move framework api change info higher in platform notes documents.
 2010-05-19 18:58:03 -07:00
Scott Main
e2c1d42332 am fa6ee245: am 68728cb3: docs: add 2.2 platform highlights 
Merge commit 'fa6ee245c7010101d87194b00f34ea3448053f28' into kraken

* commit 'fa6ee245c7010101d87194b00f34ea3448053f28':
  docs: add 2.2 platform highlights
 2010-05-19 18:08:34 -07:00
Scott Main
43fd902154 am 68728cb3: docs: add 2.2 platform highlights 
Merge commit '68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp

* commit '68728cb3b44aba16abc298a37f6110ed00a781dd':
  docs: add 2.2 platform highlights
 2010-05-19 18:06:51 -07:00
Mathias Agopian
dcf01e6644 added RWLock C++ wrapper 
Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
 2010-05-19 15:12:59 -07:00
James Dong
df7acdc186 Merge "Initial software encoder checkins" into kraken 2010-05-19 13:14:24 -07:00
Wink Saville
ebcfdd6b97 Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken 2010-05-19 13:05:55 -07:00
Scott Main
75c10b7542 am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo 
Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken

* commit '8bf77456cec82cbda3393a4e48f265af1670e795':
  docs: revise platform intro
 2010-05-19 12:11:03 -07:00
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
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
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
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
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
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
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
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
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
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
Suchi Amalapurapu
aa2c917926 am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp

* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
  Uncomment a test that was marked as STOPSHIP
 2010-05-18 14:53:37 -07:00
Suchi Amalapurapu
4f7c9354c5 Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ce8ccb1e20 am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp

* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
  Removing STOPSHIP logs.
 2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
c6c11bdbe0 Merge "Removing STOPSHIP logs." into froyo 2010-05-18 14:48:05 -07:00
Eric Laurent
558eec8011 Fix isssue 2548710: Native AudioTrack resources never freed. 
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.

The fix consists in removing the track from active list immediately if the track is terminated.

Change-Id: Iaa78a91e78d27f5c982218cc55e81702f1610ab2
 2010-05-18 14:18:57 -07:00
Suchi Amalapurapu
fb45edcb97 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. 
Merge commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c' into kraken

* commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c':
  Fix 2641875
 2010-05-18 13:17:58 -07:00
Suchi Amalapurapu
565d56d362 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. 
Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp

* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
  Fix 2641875
 2010-05-18 13:16:13 -07:00
The Android Open Source Project
6b70e82c75 am 3aecdb9d: merge from open-source master 
Merge commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken

* commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf':
  fix build
  Fix some typos and other cosmetic cleanups in telephony framework.
 2010-05-18 12:49:01 -07:00
The Android Open Source Project
5c8f92bedf merge from open-source master 
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
 2010-05-18 12:47:02 -07:00
Dianne Hackborn
bf81e1e161 Merge "Add new API to take over a window's Surface." into kraken 2010-05-18 12:21:26 -07:00
The Android Open Source Project
7e4881ecee am 5ccb8b8c: merge from open-source master 
Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken

* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
  Fix updating and deleting FDN entries with an empty alpha identifier.
  Abort FDN delete when number is empty (instead of name)
 2010-05-18 11:17:01 -07:00
The Android Open Source Project
7074d8febb merge from open-source master 
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
 2010-05-18 11:08:12 -07:00