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

21944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
2723e09229 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
3716ea04d9 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
Andreas Huber
1919e5af3d 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. 
Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4
related-to-bug: 2699505
 2010-05-20 10:37:06 -07:00
Xia Wang
069067963c If the network SSID is a string, it should be enclosed in double quotation marks. 
bug id: 2701058

Change-Id: I40e10ba096053710d4974b005d0d2e7c309ccffe
 2010-05-20 10:22:59 -07:00
Dirk Dougherty
41a254cf1b 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
Dirk Dougherty
dc737ca986 Doc change: Add new tv to carousel. 
Change-Id: Ibd36247bbab26d8d4a8e8c15a1d852a2f9cb0269
 2010-05-19 23:50:10 -07:00
Scott Main
cf7579148a 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
55f383a9b8 Merge "docs: add youtube video to highlights" into froyo 2010-05-19 20:24:18 -07:00
Scott Main
2324abdb3c docs: add youtube video to highlights 
Change-Id: Ib498ab7e18d6e54df35009b4255fce96f11bcb39
 2010-05-19 20:16:06 -07:00
Scott Main
864c3d1b90 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
8025989957 Merge "doc: add developing and testing info to backup guide" into froyo 2010-05-19 19:29:19 -07:00
Scott Main
371557fabd doc: add developing and testing info to backup guide 
Change-Id: I1e9c9f412033ecf517ea566ce70686f42e7c568e
 2010-05-19 19:17:47 -07:00
Dirk Dougherty
1eb4a9d8e9 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
Dirk Dougherty
44108b5454 Doc change: Move framework api change info higher in platform notes documents. 
Small adjustment to compatibility doc.

Change-Id: I2af896292b00323d7f4eb2c828c8dea36b9e94ad
 2010-05-19 18:22:04 -07:00
Scott Main
fa6ee245c7 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
68728cb3b4 docs: add 2.2 platform highlights 
Change-Id: I43bcdad9dbea11bfcc30eadac1ef91a2e5982df8
 2010-05-19 17:42:02 -07:00
Scott Main
8bf77456ce 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
8d0e37f5b1 Merge "docs: revise platform intro" into froyo 2010-05-19 12:05:52 -07:00
Scott Main
0a9cb85a5c docs: revise platform intro 
Change-Id: Ie1ff802179b3a2614bee78ca321db8dd064dbc7c
 2010-05-19 11:53:33 -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
2dc7c6c415 merge from open-source master 
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
 2010-05-19 09:20:22 -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
faf9a78363 merge from open-source master 
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
 2010-05-19 08:39:13 -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
d6c0bb0f0f merge from open-source master 
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
 2010-05-19 08:28:32 -07:00
The Android Open Source Project
aa2fe14849 merge from open-source master 
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
 2010-05-19 08:15:54 -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
Suchi Amalapurapu
7361b7410f 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
4a0823e548 Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ea6f6755ce 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
ef95acebdc Merge "Removing STOPSHIP logs." into froyo 2010-05-18 14:48:05 -07:00
Suchi Amalapurapu
fb7bacf6ba Uncomment a test that was marked as STOPSHIP 
Add MediumTest tag

Change-Id: I0699d168d7ec70c076f4713e0e405c0779a290c6
 2010-05-18 14:39:20 -07:00
Jaikumar Ganesh
af21fa61c2 Removing STOPSHIP logs. 
Bug: 2694602
Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
 2010-05-18 14:36:48 -07:00
Eric Laurent
42fb2ce98a 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
aa4db173a2 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
3aecdb9d7e merge from open-source master 
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
 2010-05-18 12:47:02 -07:00
Jean-Baptiste Queru
e25863c909 fix build 
Change-Id: I86ee569ec81e6c690f7697237be7d94307014142
 2010-05-18 11:54:42 -07:00
Suchi Amalapurapu
9a212adcff 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.

Change-Id: I63219369b0e7abca4919fbde2a04035a0fea9e35
 2010-05-18 11:31:50 -07:00
The Android Open Source Project
5ccb8b8c4d merge from open-source master 
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
 2010-05-18 11:08:12 -07:00
Jean-Baptiste Queru
d87ed5a5c5 Merge "Fix some typos and other cosmetic cleanups in telephony framework." 2010-05-18 10:34:42 -07:00
Jake Hamby
9f36f51844 Fix updating and deleting FDN entries with an empty alpha identifier. 
- Fix AdnRecord.buildAdnString() to generate the correct record when alpha
identifier is empty. This allows the user to update an FDN entry to remove
the alpha identifier. Previously the entire entry would be deleted because
an empty record was generated here when the alpha identifier was empty,
rather than a record containing the phone number with an empty alpha tag.
Also, return null if the number or alpha tag are too long.

- Fix bug in IccProvider.delete() where efType was compared against local
FDN constant rather than IccConstants.EF_FDN. This would always return
false. Comparing with IccConstants.EF_FDN gives the intended behavior.

Change-Id: I0ea75d7e107c7318c9a48ae6e0a15845a718f4c0
 2010-05-18 10:26:21 -07:00
Jean-Baptiste Queru
27b2267c0d Merge "Abort FDN delete when number is empty (instead of name)" 2010-05-18 10:14:14 -07:00
The Android Open Source Project
4547e5284e merge from open-source master 
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
 2010-05-18 09:18:37 -07:00
Scott Main
74e151c54c 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
5f1d100298 Merge "docs: fix markup error" into froyo 2010-05-18 08:59:03 -07:00