Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,798 Commits 3 Branches 0 Tags
ca39b95d54fbdc2216381c955ef0a1f654dedbb8
Commit Graph

21798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Egnor
aeeea3da3c am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo 
Merge commit '505f22d1a4dbf1fceaf8deca443d7322386964e1' into kraken

* commit '505f22d1a4dbf1fceaf8deca443d7322386964e1':
  Fix sim build (sim doesn't have strl*() reliably...)
 2010-04-10 11:47:29 -07:00
Kristian Monsen
53f772eddb am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo 
Merge commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31' into kraken

* commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31':
  Do not create intents for application/xhtml+xml
 2010-04-10 11:47:23 -07:00
Grace Kloba
449491ced0 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." into froyo 
Merge commit '210462e57762be9bb016b4d05374cae5f48b5aea' into kraken

* commit '210462e57762be9bb016b4d05374cae5f48b5aea':
  Set mHeldMotionless to a new MOTIONLESS_IGNORE state
 2010-04-10 11:47:15 -07:00
Dan Egnor
505f22d1a4 am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo 
Merge commit '2d3df559dea9ebb0ab263c2df26e8a345ed74d12' into froyo-plus-aosp

* commit '2d3df559dea9ebb0ab263c2df26e8a345ed74d12':
  Fix sim build (sim doesn't have strl*() reliably...)
 2010-04-10 11:41:20 -07:00
Kristian Monsen
d25fb8db8d am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo 
Merge commit '34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp

* commit '34959e3fe87012d554af07fd6ad294b2ce3daea7':
  Do not create intents for application/xhtml+xml
 2010-04-10 11:41:14 -07:00
Grace Kloba
210462e577 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." into froyo 
Merge commit 'e67e6b94fd282283f1ffa2299fae536bee099715' into froyo-plus-aosp

* commit 'e67e6b94fd282283f1ffa2299fae536bee099715':
  Set mHeldMotionless to a new MOTIONLESS_IGNORE state
 2010-04-10 11:41:09 -07:00
Mathias Agopian
c0fa658952 am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken 2010-04-10 11:38:25 -07:00
Mathias Agopian
cf2bd28510 Merge "small cleanup. gEGLImpl should have been static" into kraken 2010-04-09 14:28:03 -07:00
Mathias Agopian
e547835c52 small cleanup. gEGLImpl should have been static 
also added a ctor to initialized it in case we use it ont he stack
one day.

Change-Id: I2736b9bce3d8ba3b74fd029de4c18cca2cdbbf60
 2010-04-09 14:26:07 -07:00
Dan Egnor
2d3df559de Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo 2010-04-09 12:50:11 -07:00
Kristian Monsen
34959e3fe8 Merge "Do not create intents for application/xhtml+xml" into froyo 2010-04-09 10:59:20 -07:00
Grace Kloba
e67e6b94fd 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." into froyo 2010-04-09 10:49:42 -07:00
Kristian Monsen
e9a2fe013d Do not create intents for application/xhtml+xml 
Fix for b 2584681, webview opens contents in browser.

Change-Id: I314e808a65f3c2043bd7bc7fcd44ac071f136bdc
 2010-04-09 18:34:07 +01:00
Robert Greenwalt
4926761258 am 061cd6e3: am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo 2010-04-09 09:39:59 -07:00
Robert Greenwalt
061cd6e322 am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo 
Merge commit 'a68780dd0f0af0938b72fdf6539db575da471028' into kraken

* commit 'a68780dd0f0af0938b72fdf6539db575da471028':
  Roaming data doesn't count against limits
 2010-04-09 09:35:55 -07:00
Robert Greenwalt
a68780dd0f am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo 
Merge commit 'cb27041034343a6a15f0812d04f66fefbed30686' into froyo-plus-aosp

* commit 'cb27041034343a6a15f0812d04f66fefbed30686':
  Roaming data doesn't count against limits
 2010-04-09 09:32:03 -07:00
Robert Greenwalt
cb27041034 Merge "Roaming data doesn't count against limits" into froyo 2010-04-09 09:29:21 -07:00
Eric Laurent
6bde88b9a9 am 2dc3da60: am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-04-09 09:03:30 -07:00
Eric Laurent
2dc3da60c4 am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo 
Merge commit '1921527c8dbcb9f10683e43bca12648cb2c6e5b7' into kraken

* commit '1921527c8dbcb9f10683e43bca12648cb2c6e5b7':
  Additional fix for isssue 2548710: Native AudioTrack resources never freed.
 2010-04-09 08:58:30 -07:00
Eric Laurent
1921527c8d am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo 
Merge commit '9da7730d5f97270c356ee86298c5d6d45f39b264' into froyo-plus-aosp

* commit '9da7730d5f97270c356ee86298c5d6d45f39b264':
  Additional fix for isssue 2548710: Native AudioTrack resources never freed.
 2010-04-09 08:53:08 -07:00
Grace Kloba
9b6578071f 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.

Fix http://b/issue?id=2574172
 2010-04-09 08:51:47 -07:00
Eric Laurent
9da7730d5f Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-04-09 08:48:32 -07:00
Andreas Huber
0e9a439b0d am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 07:15:09 -07:00
Andreas Huber
b39c3aa753 am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo 
Merge commit '91ce08269600a5b46c84d9480212bf17e1107c2f' into kraken

* commit '91ce08269600a5b46c84d9480212bf17e1107c2f':
  Support for ID3 V2.4 tags.
 2010-04-09 07:09:49 -07:00
Andreas Huber
91ce082696 am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo 
Merge commit '4be2461f06de3cf70a3126d2e4590d35210b8397' into froyo-plus-aosp

* commit '4be2461f06de3cf70a3126d2e4590d35210b8397':
  Support for ID3 V2.4 tags.
 2010-04-09 07:06:11 -07:00
Andreas Huber
4be2461f06 Merge "Support for ID3 V2.4 tags." into froyo 2010-04-09 07:01:58 -07:00
Patrick Scott
c3f5a6201f am 8999c46c: am 54c5330f: am da9a22bc: Save/restore the picture in a background thread. 2010-04-09 06:47:56 -07:00
Patrick Scott
8999c46c77 am 54c5330f: am da9a22bc: Save/restore the picture in a background thread. 
Merge commit '54c5330f23adc0f9928936f44b2d20d327d900c8' into kraken

* commit '54c5330f23adc0f9928936f44b2d20d327d900c8':
  Save/restore the picture in a background thread.
 2010-04-09 06:43:47 -07:00
Patrick Scott
54c5330f23 am da9a22bc: Save/restore the picture in a background thread. 
Merge commit 'da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07' into froyo-plus-aosp

* commit 'da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07':
  Save/restore the picture in a background thread.
 2010-04-09 06:37:11 -07:00
Eric Laurent
380558bc5d Additional fix for isssue 2548710: Native AudioTrack resources never freed. 
This changes fixes the issue for the direct output thread that was not
addressed by commit 71f37cd8a1.

Change-Id: I1bbe26be5f444415dd97270e49257650f5d2858f
 2010-04-09 06:11:48 -07:00
Patrick Scott
da9a22bc5c Save/restore the picture in a background thread. 
Bug: 2573879
Change-Id: I0962f5286d3a68f8a9093f0c22917b0542ea9291
 2010-04-09 08:10:38 -04:00
Dan Egnor
4e8d8238e1 Fix sim build (sim doesn't have strl*() reliably...) 
Just stub out the TrafficStats code for the sim.
Bug: 2578938

Change-Id: Ie555f67f581d05ee446ea29cb2223feb350c52f9
 2010-04-08 23:47:06 -07:00
Dan Egnor
1554ecce32 am 5b4cc93b: am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 2010-04-08 23:12:43 -07:00
Dan Egnor
5b4cc93b0d am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 
Merge commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68' into kraken

* commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68':
  Hail-Mary attempt to avoid apparent blocking problems in readEvents().
 2010-04-08 23:08:56 -07:00
Dan Egnor
f5d506d929 am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 
Merge commit '78158db51029e7dbe160e60af0deb7594bec051d' into froyo-plus-aosp

* commit '78158db51029e7dbe160e60af0deb7594bec051d':
  Hail-Mary attempt to avoid apparent blocking problems in readEvents().
 2010-04-08 23:04:16 -07:00
Dan Egnor
78158db510 Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 
Use the same procedure (select() with a short timeout) used by "logcat -d",
which doesn't seem to have any blocking problems.

Bug: 2569403
Change-Id: Ia27bb4207919a1288716b41a007b4b4b52f8e90a
 2010-04-08 22:59:43 -07:00
Dan Egnor
f139940a91 am d069fc9a: am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 2010-04-08 22:54:34 -07:00
Xavier Ducrohet
3aa8710c4f am f31e4abd: am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo 2010-04-08 22:54:29 -07:00
Jeff Brown
52a28b2534 am 6883c176: am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 22:54:25 -07:00
Dan Egnor
d069fc9ad7 am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 
Merge commit 'a2bf73435ba776de1a55847276fc54c00648971b' into kraken

* commit 'a2bf73435ba776de1a55847276fc54c00648971b':
  Fix OperationScheduler moratorium calculation for clock rollback case.
 2010-04-08 22:50:50 -07:00
Xavier Ducrohet
f31e4abd5e am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo 
Merge commit '3895007d523a9d5c92b971908f898f19a8c9f8ff' into kraken

* commit '3895007d523a9d5c92b971908f898f19a8c9f8ff':
  Adds back the finalize method on the replaced Paint class.
 2010-04-08 22:50:46 -07:00
Jeff Brown
6883c1769f am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 
Merge commit '6c099149daff56ca04ab40a86950e7b61caf6505' into kraken

* commit '6c099149daff56ca04ab40a86950e7b61caf6505':
  Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
 2010-04-08 22:50:42 -07:00
Dan Egnor
a2bf73435b am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 
Merge commit '70c294b205f7b27308c45bf893270bef6081d39b' into froyo-plus-aosp

* commit '70c294b205f7b27308c45bf893270bef6081d39b':
  Fix OperationScheduler moratorium calculation for clock rollback case.
 2010-04-08 22:39:27 -07:00
Xavier Ducrohet
3895007d52 am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo 
Merge commit 'bbc6e33b1f7fff3280c3fa44836833f4bab4bf99' into froyo-plus-aosp

* commit 'bbc6e33b1f7fff3280c3fa44836833f4bab4bf99':
  Adds back the finalize method on the replaced Paint class.
 2010-04-08 22:39:24 -07:00
Jeff Brown
6c099149da am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 
Merge commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46' into froyo-plus-aosp

* commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46':
  Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
 2010-04-08 22:39:19 -07:00
Mathias Agopian
88235a5e9b am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-08 22:38:29 -07:00
Robert Greenwalt
5f996899b0 Roaming data doesn't count against limits 
bug:2576057
Change-Id: I51a66e3b49a62e0186816ec0473814a216184e6b
 2010-04-08 19:12:38 -07:00