ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,488 Commits 2 Branches 0 Tags 54 MiB
1a5fe61ee1
Commit Graph

14488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
1a5fe61ee1 am d1055a25: Make the NTP Cache max-age gservices-settable 
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable
 2010-05-25 16:13:22 -07:00
Adam Powell
213f391635 am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children. 
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp

* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
 2010-05-24 16:23:53 -07:00
Dirk Dougherty
534663ed7b am c7c7afd7: Doc change: Fix incorrect adt version reference etc. 
Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp

* commit 'c7c7afd7a1af36e787266815487f4600196406b8':
  Doc change: Fix incorrect adt version reference etc.
 2010-05-24 09:56:47 -07:00
Andreas Huber
22f6934983 am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo 
Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp

* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
  Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
 2010-05-20 11:13:20 -07:00
Andreas Huber
5fed07aa18 Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo 2010-05-20 11:11:39 -07:00
Xia Wang
639f95ed10 am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks. 
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp

* commit '069067963cf0117cfb4a1aef99b550b126d9ca92':
  If the network SSID is a string, it should be enclosed in double quotation marks.
 2010-05-20 10:56:13 -07:00
Dirk Dougherty
1a4edf5b0d am dc737ca9: Doc change: Add new tv to carousel. 
Merge commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp

* commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6':
  Doc change: Add new tv to carousel.
 2010-05-20 00:15:41 -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
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
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
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
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
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
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
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
ba7eb7398b merge from open-source master 
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
 2010-05-19 08:28:32 -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
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
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
5c8f92bedf merge from open-source master 
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
 2010-05-18 12:47:02 -07:00
The Android Open Source Project
7074d8febb merge from open-source master 
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
 2010-05-18 11:08:12 -07:00
Jean-Baptiste Queru
9addb68e3b Merge "Fix some typos and other cosmetic cleanups in telephony framework." 2010-05-18 10:34:42 -07:00
Jean-Baptiste Queru
ff796e109f Merge "Abort FDN delete when number is empty (instead of name)" 2010-05-18 10:14:14 -07:00
The Android Open Source Project
645ab2efb0 merge from open-source master 
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
 2010-05-18 09:18:37 -07:00
Scott Main
e16cbc55b1 am 5f1d1002: Merge "docs: fix markup error" into froyo 
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp

* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
  docs: fix markup error
 2010-05-18 09:02:09 -07:00
Scott Main
86080540cb Merge "docs: fix markup error" into froyo 2010-05-18 08:59:03 -07:00
Scott Main
573edfa591 am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp

* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
  docs: revise webview description and add info for targeting screen densities
 2010-05-17 18:01:28 -07:00
Scott Main
0c9d6432d5 Merge "docs: revise webview description and add info for targeting screen densities" into froyo 2010-05-17 17:59:37 -07:00
Dirk Dougherty
846ef80952 am 6750bb7f: Doc change: add link to source.android.com 
Merge commit '6750bb7f838b15ef25544d7aa66b17119fcd7227' into froyo-plus-aosp

* commit '6750bb7f838b15ef25544d7aa66b17119fcd7227':
  Doc change: add link to source.android.com
 2010-05-17 17:37:28 -07:00
Dirk Dougherty
1769eecb4a am 6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for screens update platform dashboard 
Merge commit '6bb6348f2a542b05b9945f28566fb876cf6aee2e' into froyo-plus-aosp

* commit '6bb6348f2a542b05b9945f28566fb876cf6aee2e':
  Doc change: cherry pick from eclair ->docs: add dashboard for screens
 2010-05-17 17:04:48 -07:00
Mike Lockwood
a309fb7ae7 am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp

* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:56:53 -07:00
Kenny Root
b118f139f4 am cfa2de30: Import revised translations 
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp

* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
  Import revised translations
 2010-05-17 11:37:35 -07:00
The Android Open Source Project
ba7718b979 merge from open-source master 
Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9
 2010-05-17 10:38:00 -07:00
Jean-Baptiste Queru
0e08624ad2 Merge "Updated RGB LED test cases" 2010-05-17 09:12:43 -07:00
The Android Open Source Project
5a64b6daec merge from open-source master 
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
 2010-05-17 08:56:54 -07:00
Romain Guy
9100be5973 Merge "Fixing indeterminate progress bar animation state." 2010-05-15 12:34:05 -07:00