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

13981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
159e0fab20 am fc5aa9cf: Merge "doc change: miscellaneous small fixes." into froyo 
Merge commit 'fc5aa9cfd103258c45fe1d6c072e93f227a044d8' into froyo-plus-aosp

* commit 'fc5aa9cfd103258c45fe1d6c072e93f227a044d8':
  doc change: miscellaneous small fixes.
 2010-04-02 18:40:50 -07:00
Dirk Dougherty
f0f3904bb8 Merge "doc change: miscellaneous small fixes." into froyo 2010-04-02 18:37:10 -07:00
Amith Yamasani
bc6f37b5bc am c2e060cb: am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 
Merge commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649' into kraken

* commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
 2010-04-02 17:27:31 -07:00
Amith Yamasani
425edcc517 am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 
Merge commit '0913ce95c29371cb7b58e294a8d60262bc7f4329' into froyo-plus-aosp

* commit '0913ce95c29371cb7b58e294a8d60262bc7f4329':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
 2010-04-02 17:24:49 -07:00
Amith Yamasani
1a77a91711 Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 2010-04-02 17:20:53 -07:00
Grace Kloba
3acbe562bb am 6f8b89bb: am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 
Merge commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec' into kraken

* commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec':
  Make sure when WebView modified mScrollX/Y directly,
 2010-04-02 16:52:23 -07:00
Grace Kloba
5febcc24e9 am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 
Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp

* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
  Make sure when WebView modified mScrollX/Y directly,
 2010-04-02 16:46:39 -07:00
Grace Kloba
ee62d8b26e Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 2010-04-02 16:41:13 -07:00
Adam Powell
5fedbc8cf3 am 128f1a87: am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Merge commit '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken

* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
 2010-04-02 16:25:33 -07:00
Adam Powell
a38453fbcb am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp

* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
 2010-04-02 16:20:54 -07:00
Andreas Huber
f2b4caab4f am 0f7c543c: am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 
Merge commit '0f7c543cc48d287591b5638a15bf8ca977e162a2' into kraken

* commit '0f7c543cc48d287591b5638a15bf8ca977e162a2':
  Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
 2010-04-02 14:14:24 -07:00
Andreas Huber
701d02624e am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 
Merge commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866' into froyo-plus-aosp

* commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866':
  Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
 2010-04-02 14:09:11 -07:00
Andreas Huber
4b3bf35b0a Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:03:46 -07:00
Charles Chen
df2fb836a9 am 36b205dc: am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 
Merge commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b' into kraken

* commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b':
  Unhiding TTS API constants and methods needed for TTS plugin support.
 2010-04-02 13:48:25 -07:00
Charles Chen
d0b2a29cd9 am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp

* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
  Unhiding TTS API constants and methods needed for TTS plugin support.
 2010-04-02 13:45:30 -07:00
Dianne Hackborn
dc8c03a8b4 am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken

* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
  Add a new intent category used for activities running in carmode.
 2010-04-02 13:42:09 -07:00
Dianne Hackborn
b64822a3ca am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp

* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
  Add a new intent category used for activities running in carmode.
 2010-04-02 13:39:11 -07:00
Dianne Hackborn
f57216f124 Merge "Add a new intent category used for activities running in carmode." into froyo 2010-04-02 13:35:59 -07:00
Irfan Sheriff
9a8c69fbfa am 90bd9433: am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo 
Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken

* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
  Dont start wifi if in airplane mode
 2010-04-02 12:53:49 -07:00
Suchi Amalapurapu
c66a143c81 am 21f15f68: am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo 
Merge commit '21f15f68c2940a87954d9889e208ffbbed2c1995' into kraken

* commit '21f15f68c2940a87954d9889e208ffbbed2c1995':
  Handle exceptions when doing dexopt.
 2010-04-02 12:53:45 -07:00
Irfan Sheriff
65e79b2e6b am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo 
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp

* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
  Dont start wifi if in airplane mode
 2010-04-02 12:51:05 -07:00
Suchi Amalapurapu
1ec78f0ce3 am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo 
Merge commit 'a77acab9c623a8b63b46d14686cf1a86dd863289' into froyo-plus-aosp

* commit 'a77acab9c623a8b63b46d14686cf1a86dd863289':
  Handle exceptions when doing dexopt.
 2010-04-02 12:51:01 -07:00
Irfan Sheriff
5cbb4dc9f7 Merge "Dont start wifi if in airplane mode" into froyo 2010-04-02 12:47:45 -07:00
Suchi Amalapurapu
eeb2f83f02 Merge "Handle exceptions when doing dexopt." into froyo 2010-04-02 12:46:38 -07:00
Andreas Huber
2f1268db5e am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 
Merge commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad' into kraken

* commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad':
  Support another kind of iso mpeg4 file.
 2010-04-02 11:26:55 -07:00
Andreas Huber
37c13661cd am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 
Merge commit '29039deea99a5529d92f7add3f9077ab247d3acd' into froyo-plus-aosp

* commit '29039deea99a5529d92f7add3f9077ab247d3acd':
  Support another kind of iso mpeg4 file.
 2010-04-02 11:21:34 -07:00
Andreas Huber
c8eafefc59 Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:18:32 -07:00
Adam Powell
fd171639a4 am 1f29b4cd: am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 
Merge commit '1f29b4cd1280cc223b7bafd5d4d7a232a5b3c40f' into kraken

* commit '1f29b4cd1280cc223b7bafd5d4d7a232a5b3c40f':
  Fix AbsListView scrolling behavior at edges.
 2010-04-02 11:10:03 -07:00
Adam Powell
f1687bbec8 am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 
Merge commit '219909224d9f5fdb4fe1c97fad048894c4619fe7' into froyo-plus-aosp

* commit '219909224d9f5fdb4fe1c97fad048894c4619fe7':
  Fix AbsListView scrolling behavior at edges.
 2010-04-02 11:06:34 -07:00
Daniel Sandler
a3193c2f15 am 750edffb: am 25642f0b: Merge "Make desk mode work again." into froyo 
Merge commit '750edffbc0fe528b93097f9ce909f446540cfff5' into kraken

* commit '750edffbc0fe528b93097f9ce909f446540cfff5':
  Make desk mode work again.
 2010-04-02 11:03:13 -07:00
Adam Powell
0538289113 Merge "Fix AbsListView scrolling behavior at edges." into froyo 2010-04-02 11:02:21 -07:00
Fred Quintana
9618159766 am 3667b9b4: am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken

* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
  revert the stripping of System Group:
 2010-04-02 11:00:30 -07:00
Daniel Sandler
ad27615f98 am 25642f0b: Merge "Make desk mode work again." into froyo 
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp

* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
  Make desk mode work again.
 2010-04-02 10:59:41 -07:00
Daniel Sandler
9e2cd9a4c0 Merge "Make desk mode work again." into froyo 2010-04-02 10:54:57 -07:00
Fred Quintana
5f8ce2b7bf am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp

* commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf':
  revert the stripping of System Group:
 2010-04-02 10:53:22 -07:00
Fred Quintana
51eeb54714 Merge "revert the stripping of System Group: from the names of google system groups" into froyo 2010-04-02 10:47:11 -07:00
Brett Chabot
220eec1971 am f5071884: am c1548e38: Merge "Add test annotations to frameworks common tests." into froyo 
Merge commit 'f5071884809219edb420a4f7c4a0eef9523d7bca' into kraken

* commit 'f5071884809219edb420a4f7c4a0eef9523d7bca':
  Add test annotations to frameworks common tests.
 2010-04-02 10:33:51 -07:00
Brett Chabot
4371e8da29 am c1548e38: Merge "Add test annotations to frameworks common tests." into froyo 
Merge commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192' into froyo-plus-aosp

* commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192':
  Add test annotations to frameworks common tests.
 2010-04-02 10:28:36 -07:00
Brett Chabot
c4a82edf66 Merge "Add test annotations to frameworks common tests." into froyo 2010-04-02 10:24:00 -07:00
Grace Kloba
46740ea2fd am f34d9e20: am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 
Merge commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken

* commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
  Instead of holding an ApplicationContext, JWebCoreJavaBridge
 2010-04-02 09:22:07 -07:00
Grace Kloba
95ec80add2 am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 
Merge commit '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp

* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
  Instead of holding an ApplicationContext, JWebCoreJavaBridge
 2010-04-02 09:19:06 -07:00
Jean-Michel Trivi
34a9636ac0 am 28525488: am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 
Merge commit '28525488fb5769fb119b01db17dc0ed305f0e7b0' into kraken

* commit '28525488fb5769fb119b01db17dc0ed305f0e7b0':
  Fix bug 2565463 Ensure an object cannot appear twice in the
 2010-04-02 09:16:05 -07:00
Dave Sparks
9d46928775 am 6c8770df: am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 
Merge commit '6c8770df939782d767fdf2cdb68c4a289015a5e6' into kraken

* commit '6c8770df939782d767fdf2cdb68c4a289015a5e6':
  Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
 2010-04-02 09:16:02 -07:00
Grace Kloba
4443e6ce77 Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo 2010-04-02 09:14:39 -07:00
Jean-Michel Trivi
4beb20feeb am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 
Merge commit '9ab05fff41e983c9b3175096c320aefced81276b' into froyo-plus-aosp

* commit '9ab05fff41e983c9b3175096c320aefced81276b':
  Fix bug 2565463 Ensure an object cannot appear twice in the
 2010-04-02 09:12:10 -07:00
Dave Sparks
26e4b29206 am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 
Merge commit 'd9c16c37ea28933973f32cb434f770226266b675' into froyo-plus-aosp

* commit 'd9c16c37ea28933973f32cb434f770226266b675':
  Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
 2010-04-02 09:11:56 -07:00
Jean-Michel Trivi
4c9bf79786 Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 2010-04-02 08:53:42 -07:00
Brett Chabot
49b35b5f9c Add test annotations to frameworks common tests. 
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
 2010-04-02 08:53:22 -07:00
Dave Sparks
8421672e2e Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 2010-04-02 07:56:44 -07:00
Brett Chabot
68cec9661c am 16d77b8d: am c162668e: Merge "More framework tests cleanup." into froyo 
Merge commit '16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed' into kraken

* commit '16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed':
  More framework tests cleanup.
 2010-04-01 21:53:19 -07:00