ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
15,102 Commits 2 Branches 0 Tags 54 MiB
b0151801a0
Commit Graph

15102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
b0151801a0 Merge "Add UUID property for adapter." into kraken 2010-05-05 15:25:54 -07:00
Dianne Hackborn
5839405089 Merge "First pass at NativeActivity." into kraken 2010-05-05 15:18:59 -07:00
Jean-Michel Trivi
090ae596a7 am fc12b5be: am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo 
Merge commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346' into kraken

* commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346':
  Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
 2010-05-05 12:06:12 -07:00
Jean-Michel Trivi
96bbb9e978 am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo 
Merge commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9' into froyo-plus-aosp

* commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9':
  Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
 2010-05-05 12:03:43 -07:00
Jean-Michel Trivi
e4e1811a2e Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn't fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo 2010-05-05 12:02:18 -07:00
James Dong
894c2f39d5 Merge "Support audio and video track interleaving in the recorded mp4 file" into kraken 2010-05-05 11:40:51 -07:00
Scott Main
ced32b826c am 9aa12f85: am a69e10db: fix doc bug in hello gallery tutorial 
Merge commit '9aa12f85bef352bbc528fbee2ccd7350a2f30394' into kraken

* commit '9aa12f85bef352bbc528fbee2ccd7350a2f30394':
  fix doc bug in hello gallery tutorial
 2010-05-05 09:29:39 -07:00
Scott Main
3e56175a45 am a69e10db: fix doc bug in hello gallery tutorial 
Merge commit 'a69e10db2fb58deb5e27aa67c46d267af928374b' into froyo-plus-aosp

* commit 'a69e10db2fb58deb5e27aa67c46d267af928374b':
  fix doc bug in hello gallery tutorial
 2010-05-05 09:27:50 -07:00
Dianne Hackborn
5a1693c626 am 3445dae3: am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 
Merge commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2' into kraken

* commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2':
  Fix issue #2643754: Launcher is caching widget layouts for too long
 2010-05-04 18:30:51 -07:00
Bjorn Bringert
630ff135a4 am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo 
Merge commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken

* commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
  Build searchables list after boot
 2010-05-04 18:30:47 -07:00
Dianne Hackborn
ec2d0323cf am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp

* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
  Fix issue #2643754: Launcher is caching widget layouts for too long
 2010-05-04 18:22:39 -07:00
Bjorn Bringert
930ee51fae am c9dc1090: Merge "Build searchables list after boot" into froyo 
Merge commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp

* commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf':
  Build searchables list after boot
 2010-05-04 18:22:36 -07:00
Dianne Hackborn
25932b1088 Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 2010-05-04 17:43:25 -07:00
Bjorn Bringert
f442576ecf Merge "Build searchables list after boot" into froyo 2010-05-04 16:57:56 -07:00
Scott Main
f3847f9b76 am 0915d0aa: am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo 
Merge commit '0915d0aa9c13b365d48c6868ac47913ecd172d07' into kraken

* commit '0915d0aa9c13b365d48c6868ac47913ecd172d07':
  docs: resolve doc bug
 2010-05-04 16:06:57 -07:00
Scott Main
c224e59822 am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo 
Merge commit '5e5202bd6f9e7687fc6399762529b0ef5625e515' into froyo-plus-aosp

* commit '5e5202bd6f9e7687fc6399762529b0ef5625e515':
  docs: resolve doc bug
 2010-05-04 16:04:46 -07:00
Scott Main
d11ab7456a Merge "docs: resolve doc bug bug:2648699" into froyo 2010-05-04 16:03:37 -07:00
Jaikumar Ganesh
dea9058c55 Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken 2010-05-04 15:53:31 -07:00
Adam Powell
69993124b0 am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 
Merge commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken

* commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
 2010-05-04 15:41:41 -07:00
Adam Powell
2b349fac4d am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp

* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
 2010-05-04 15:40:36 -07:00
James Dong
a6ae071ee1 Merge "Support AAC recording" into kraken 2010-05-04 14:40:28 -07:00
Andreas Huber
80637684aa am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 
Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken

* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
  Support for Ogg Vorbis decoding in stagefright.
 2010-05-04 14:30:34 -07:00
Andreas Huber
e7f1b6dd9c am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 
Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp

* commit 'e083d0a2f50906423ab548047d436c74648fc488':
  Support for Ogg Vorbis decoding in stagefright.
 2010-05-04 14:29:04 -07:00
Andreas Huber
fe8bcd9c8a Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 2010-05-04 14:27:26 -07:00
Scott Main
c2e89d246e am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken

* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
  docs: revise and add documentation for backup APIs
 2010-05-04 14:22:47 -07:00
Scott Main
46016a24eb am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
 2010-05-04 14:21:21 -07:00
Scott Main
69c8c1c8db Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -07:00
Daniel Sandler
3adf5f2abf am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken

* commit '342a3800b9b31929b337d298a24184d820f27f26':
  Increase the row height of menus by 1dip.
 2010-05-04 12:45:53 -07:00
Dan Morrill
2243017061 am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
  Adding the backward-compatible filtering heuristics for the new device
 2010-05-04 12:45:49 -07:00
Joe Onorato
25ab836708 am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated. 
Merge commit '77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken

* commit '77da7312215c4a433e3f53c2fe306307fc3bad52':
  Call into app widget hosts when the provider is updated.
 2010-05-04 12:45:44 -07:00
Daniel Sandler
f27cbc7bed am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp

* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
  Increase the row height of menus by 1dip.
 2010-05-04 12:42:48 -07:00
Daniel Sandler
2da986fbd2 Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:40:54 -07:00
Dan Morrill
34910b3d28 am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 
Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp

* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
  Adding the backward-compatible filtering heuristics for the new device
 2010-05-04 12:38:03 -07:00
Joe Onorato
906a59288c am f140be6c: Call into app widget hosts when the provider is updated. 
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp

* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
  Call into app widget hosts when the provider is updated.
 2010-05-04 12:37:59 -07:00
Dan Morrill
515eb68646 Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:03:45 -07:00
The Android Open Source Project
61aee0c845 am 6de3a6fd: merge from open-source master 
Merge commit '6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken

* commit '6de3a6fdd303b15ad944570daf37faa798dc1989':
  Fix typo of <p> end tag in appwidgets.xml
 2010-05-04 09:27:35 -07:00
The Android Open Source Project
00ad0d2d5c merge from open-source master 
Change-Id: I5f552b45caae639170674213c23f154437b58afd
 2010-05-04 09:20:16 -07:00
Romain Guy
a4b249c12f Merge "Fix typo of <p> end tag in appwidgets.xml" 2010-05-03 16:25:34 -07:00
The Android Open Source Project
439dcb36ed am 007ad770: merge from open-source master 
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
 2010-05-03 16:25:15 -07:00
The Android Open Source Project
0fb44af855 merge from open-source master 
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
 2010-05-03 16:19:31 -07:00
Jean-Baptiste Queru
c95afe73fd am 2529d4ea: Adapt to new location of libcore 
Merge commit '2529d4eab80778aef9c7a9fe27712a41686d22c4' into kraken

* commit '2529d4eab80778aef9c7a9fe27712a41686d22c4':
  Adapt to new location of libcore
 2010-05-02 16:11:32 -07:00
Xia Wang
e981b356e1 Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:49:23 -07:00
Mathias Agopian
d52128786f make sure the server-side validates pointers/indices visible on the client side 
Change-Id: I604f58d3fcd2d09ec7998123c627401081345cd6
 2010-04-30 13:05:36 -07:00
Mathias Agopian
30c4c182ec Merge "Add support for enqueuing buffers in arbitrary order" into kraken 2010-04-30 12:58:11 -07:00
Daniel Sandler
bfe2180f5c am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 
Merge commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8' into kraken

* commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8':
  Tweak style of recent apps dialog title.
 2010-04-30 11:34:03 -07:00
Daniel Sandler
ea4638de04 am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 
Merge commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e' into froyo-plus-aosp

* commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e':
  Tweak style of recent apps dialog title.
 2010-04-30 11:30:29 -07:00
Daniel Sandler
70f124064f Merge "Tweak style of recent apps dialog title." into froyo 2010-04-30 10:55:03 -07:00
Scott Main
3b97564b34 am 27963bbc: am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo 
Merge commit '27963bbc25278885f57965f6bf8250d6eeabd94a' into kraken

* commit '27963bbc25278885f57965f6bf8250d6eeabd94a':
  docs: editorial revisions to the bmgr tool doc
 2010-04-29 21:24:25 -07:00
Scott Main
91916b0291 am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo 
Merge commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp

* commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
  docs: editorial revisions to the bmgr tool doc
 2010-04-29 21:23:10 -07:00
Scott Main
878f4e537c Merge "docs: editorial revisions to the bmgr tool doc" into froyo 2010-04-29 21:22:17 -07:00