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

22035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
9448d6f4dd am 54419a4f: am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. 
Merge commit '54419a4fc908eab8408f39f3eae97c4315135d84' into kraken

* commit '54419a4fc908eab8408f39f3eae97c4315135d84':
  Fix monkey bug 2586534 java.util.ConcurrentModificationException
 2010-04-12 12:11:54 -07:00
Jean-Michel Trivi
54419a4fc9 am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corr 
Merge commit '12221b6f7c86349e3dcf89f814355e41f9e58cbf' into froyo-plus-aosp

* commit '12221b6f7c86349e3dcf89f814355e41f9e58cbf':
  Fix monkey bug 2586534 java.util.ConcurrentModificationException
 2010-04-12 12:07:44 -07:00
Jean-Michel Trivi
12221b6f7c Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo 2010-04-12 12:05:08 -07:00
Patrick Scott
86cc001c9f am c9eaa3cb: am 36acfbc2: Add a bulk request method for bookmark icons. 
Merge commit 'c9eaa3cbb0d6152cd156a9e66ef23389042b48b5' into kraken

* commit 'c9eaa3cbb0d6152cd156a9e66ef23389042b48b5':
  Add a bulk request method for bookmark icons.
 2010-04-12 11:55:53 -07:00
Patrick Scott
c9eaa3cbb0 am 36acfbc2: Add a bulk request method for bookmark icons. 
Merge commit '36acfbc2b8df6e62f2d583933eca3a49265279a6' into froyo-plus-aosp

* commit '36acfbc2b8df6e62f2d583933eca3a49265279a6':
  Add a bulk request method for bookmark icons.
 2010-04-12 11:53:09 -07:00
Patrick Scott
36acfbc2b8 Add a bulk request method for bookmark icons. 
Rather than dispatch a message for every url in the db, send a message to the
WebCoreThread to handle the query and iteration.  Update the documentation for
requestAllIcons.

Bug: 2581894
Change-Id: I8af4f87570465dff3839db4ac492883e8805b007
 2010-04-12 14:26:13 -04:00
Andreas Huber
26a46c4ff6 am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo 
Merge commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293' into kraken

* commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293':
  Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
 2010-04-12 11:07:54 -07:00
Andreas Huber
f0a49f68f0 am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo 
Merge commit '1d7a8b448e9371685894b6b02d29bcd3ae959545' into froyo-plus-aosp

* commit '1d7a8b448e9371685894b6b02d29bcd3ae959545':
  Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
 2010-04-12 11:05:36 -07:00
Andreas Huber
967a263d70 Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken 2010-04-12 11:05:22 -07:00
Andreas Huber
4501f62d7a Merge "Remove unnecessary lock from AMRWriter." into kraken 2010-04-12 11:05:09 -07:00
Andreas Huber
a7f57ef707 Merge "Various fixes to enable recording on passion and nexus1." into kraken 2010-04-12 11:04:57 -07:00
Andreas Huber
4b2bc736b1 Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken 2010-04-12 11:04:46 -07:00
Andreas Huber
1d7a8b448e Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo 2010-04-12 11:02:27 -07:00
Andreas Huber
8f14c55248 Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request. 
Change-Id: I4cabd18709c29db0a2763a01cc86525ba0b0aeb7
related-to-bug: 2575976
 2010-04-12 10:20:12 -07:00
Andreas Huber
36c87ca652 am 10d40772: am cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 
Merge commit '10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0' into kraken

* commit '10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0':
  Ignore corrupt aac audio frames and substitute silence.
 2010-04-12 10:16:11 -07:00
Andreas Huber
e8985420bb am b1e7bee2: am 040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started. 
Merge commit 'b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4' into kraken

* commit 'b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4':
  Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
 2010-04-12 10:16:08 -07:00
Andreas Huber
10d4077240 am cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 
Merge commit 'cdded187d20bdc6379c5a09bdd2002fa070b745d' into froyo-plus-aosp

* commit 'cdded187d20bdc6379c5a09bdd2002fa070b745d':
  Ignore corrupt aac audio frames and substitute silence.
 2010-04-12 10:14:08 -07:00
Andreas Huber
b1e7bee2f3 am 040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started. 
Merge commit '040301cad17e447d760e7b7e54b79c8c294415ea' into froyo-plus-aosp

* commit '040301cad17e447d760e7b7e54b79c8c294415ea':
  Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
 2010-04-12 10:12:29 -07:00
Andreas Huber
cdded187d2 Merge "Ignore corrupt aac audio frames and substitute silence." into froyo 2010-04-12 10:11:32 -07:00
Andreas Huber
3f26cade62 Ignore corrupt aac audio frames and substitute silence. 
Change-Id: I544f98a5c00d912061db7921fc4518435209b168
related-to-bug: 2575976
 2010-04-12 09:57:05 -07:00
Andreas Huber
040301cad1 Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started. 
Change-Id: Ieaa90cc9b54bd56963aa5f4daced2ba243801acf
related-to-bug: 2585913
 2010-04-12 09:41:12 -07:00
Leon Scroggins
6636ff18d4 am fac110dc: am 853a4240: am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode. 2010-04-12 08:17:38 -07:00
Leon Scroggins
fac110dc24 am 853a4240: am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode. 
Merge commit '853a42409b34b3aff118c7a09e390477247d002b' into kraken

* commit '853a42409b34b3aff118c7a09e390477247d002b':
  Do not check mWebTextView's focus state to determine editing mode.
 2010-04-12 08:14:35 -07:00
Leon Scroggins
853a42409b am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode. 
Merge commit '63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp

* commit '63284ede623ca8a4119f1f44b86fbf017faba8dc':
  Do not check mWebTextView's focus state to determine editing mode.
 2010-04-12 08:11:40 -07:00
Leon Scroggins
63284ede62 Do not check mWebTextView's focus state to determine editing mode. 
Fix for bug 2568400.

Change-Id: I7e285388484bbab3aef9b6f4bb190e001266ce53
 2010-04-12 10:55:39 -04:00
Kristian Monsen
ab355380f0 Fix (again) for bug 2558156, update cache encoding correctly 
My fault, the last fix did not fix the issue completly. Now setting the listener so the cache item can be found when the encoding is to be set by the background worker.

Change-Id: Iea514ada9b4f52760033daee66aa29cdceda1c9e
 2010-04-12 12:07:30 +01:00
Wu-cheng Li
76fc56fb65 am 926d9a89: am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF. 2010-04-10 11:55:00 -07:00
Scott Main
f63d616b38 am 8e60e092: am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 2010-04-10 11:54:56 -07:00
Dianne Hackborn
7c48d939e2 am e1b462d7: am 06af7620: am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 2010-04-10 11:54:51 -07:00
Robert Greenwalt
890a53c9d8 am 6890bfba: am 52ebff3c: am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo 2010-04-10 11:54:47 -07:00
Yu Shan Emily Lau
5b1b4993d3 am 45c566e9: am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 2010-04-10 11:54:42 -07:00
Romain Guy
aa03df8afc am 50e0d9ae: am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 2010-04-10 11:54:36 -07:00
Wink Saville
d5f8da30d1 am 472ba185: am 19fe70cb: am a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo 2010-04-10 11:54:30 -07:00
Wei Huang
235af29996 am 92671e5e: am 997b3803: am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 2010-04-10 11:54:25 -07:00
Jesse Wilson
97a22e1b44 am 86b0276a: am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 2010-04-10 11:54:19 -07:00
Mike Reed
1e5b95ad88 am 1064a131: am 58d50183: am a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo 2010-04-10 11:54:13 -07:00
Robert Greenwalt
b049ab29ae am 82052192: am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo 2010-04-10 11:54:05 -07:00
Dan Egnor
ca39b95d54 am aeeea3da: am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo 2010-04-10 11:53:59 -07:00
Kristian Monsen
2843b0e3a6 am 53f772ed: am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo 2010-04-10 11:53:52 -07:00
Grace Kloba
6fd142421d am 449491ce: am 210462e5: am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling. 2010-04-10 11:53:46 -07:00
Wu-cheng Li
926d9a89ed am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF. 
Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken

* commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
  Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
 2010-04-10 11:48:24 -07:00
Scott Main
8e60e09219 am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo 
Merge commit '67d6590d242397acbb95814139301d2e6efd3631' into kraken

* commit '67d6590d242397acbb95814139301d2e6efd3631':
  cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
 2010-04-10 11:48:20 -07:00
Dianne Hackborn
e1b462d76d am 06af7620: am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo 
Merge commit '06af762033467bb578b9ed2be8af580cc11505a8' into kraken

* commit '06af762033467bb578b9ed2be8af580cc11505a8':
  Fix issue #2581524: Car home icon should always go to car home
 2010-04-10 11:48:15 -07:00
Robert Greenwalt
6890bfba4f am 52ebff3c: am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo 
Merge commit '52ebff3c47eb3fcd43d0337a43312240f7d2010e' into kraken

* commit '52ebff3c47eb3fcd43d0337a43312240f7d2010e':
  Add warning magic to be a bit more reasonable.
 2010-04-10 11:48:11 -07:00
Yu Shan Emily Lau
45c566e98a am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo 
Merge commit '6e40664fc75e25ebeafda883fc2bba27279bebdd' into kraken

* commit '6e40664fc75e25ebeafda883fc2bba27279bebdd':
  Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
 2010-04-10 11:48:06 -07:00
Romain Guy
50e0d9ae31 am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 
Merge commit '376722fcdf41ade7286bcdb757564559d35a4976' into kraken

* commit '376722fcdf41ade7286bcdb757564559d35a4976':
  Fix regression introduced when fixing focus issue with ScrollView.
 2010-04-10 11:48:02 -07:00
Wink Saville
472ba18537 am 19fe70cb: am a18c824c: Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo 
Merge commit '19fe70cbe70615d2d639fec2a2a3ab35d00d43ef' into kraken

* commit '19fe70cbe70615d2d639fec2a2a3ab35d00d43ef':
  Fix a FATAL ClassCastException in DataConnection.java
 2010-04-10 11:47:57 -07:00
Wei Huang
92671e5e4d am 997b3803: am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 
Merge commit '997b38036f5ac5db69191d090c8c3c1d1b05aace' into kraken

* commit '997b38036f5ac5db69191d090c8c3c1d1b05aace':
  bug #2542580: add the appropriate mdpi asset for chat icon.
 2010-04-10 11:47:51 -07:00
Jesse Wilson
86b0276a39 am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 
Merge commit 'f9e90378d50210298d1cec2b913653597cd62be4' into kraken

* commit 'f9e90378d50210298d1cec2b913653597cd62be4':
  Move the public method HttpDateTime.parse() into AndroidHttpClient.
 2010-04-10 11:47:45 -07:00
Mike Reed
1064a13181 am 58d50183: am a3c4c219: Merge "final versions of these fonts from ascender, including GPOS \'mark\' feature" into froyo 
Merge commit '58d50183bc7c125db76f5ca8f76816ebb9f19d17' into kraken

* commit '58d50183bc7c125db76f5ca8f76816ebb9f19d17':
  final versions of these fonts from ascender, including GPOS 'mark' feature
 2010-04-10 11:47:40 -07:00