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

15058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
91c474ab4e am 19fa6d45: am 738a0460: Merge "Don\'t inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo 
Merge commit '19fa6d4586df8ff7897fcc73b2228b431502d58e' into kraken

* commit '19fa6d4586df8ff7897fcc73b2228b431502d58e':
  Don't inflate the zoom button controller until we
 2010-04-20 11:47:31 -07:00
Grace Kloba
471ae8e8cc am 738a0460: Merge "Don\'t inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo 
Merge commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a' into froyo-plus-aosp

* commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a':
  Don't inflate the zoom button controller until we
 2010-04-20 11:43:18 -07:00
Carl Shapiro
4dd73c65e4 Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo 2010-04-20 11:42:39 -07:00
Grace Kloba
f1f24f304b Merge "Don't inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo 2010-04-20 11:40:07 -07:00
Marco Nelissen
1de1a5fffb am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d 
Merge commit '9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken

* commit '9d14e3ea22f48173070789951ee6dc64b507e13f':
  When updating existing entries in the media database, don't update
 2010-04-20 11:33:21 -07:00
Marco Nelissen
aeabc2a827 am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d 
Merge commit '9b8b417cd1ddfb81c1b0314f033a1439fd627aa2' into froyo-plus-aosp

* commit '9b8b417cd1ddfb81c1b0314f033a1439fd627aa2':
  When updating existing entries in the media database, don't update
 2010-04-20 11:28:59 -07:00
Marco Nelissen
dbd5ad43e8 Merge "When updating existing entries in the media database, don't update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2" into froyo 2010-04-20 11:24:10 -07:00
Eric Laurent
e601bdb8d1 am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing. 
Merge commit '11bae14009d91c063780b2cafee2fc4fb660c08c' into kraken

* commit '11bae14009d91c063780b2cafee2fc4fb660c08c':
  Fix issue 2602879: camera shutter sound not playing.
 2010-04-20 10:22:27 -07:00
Eric Laurent
dfa927920c am 3891c4cc: Fix issue 2602879: camera shutter sound not playing. 
Merge commit '3891c4cc918e8062abb97c542a8625d556dccc59' into froyo-plus-aosp

* commit '3891c4cc918e8062abb97c542a8625d556dccc59':
  Fix issue 2602879: camera shutter sound not playing.
 2010-04-20 10:18:07 -07:00
Eric Laurent
6dc7e7c7d2 am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking. 
Merge commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd' into kraken

* commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd':
  Fix issue 2604270  Device auto connects to Car Dock (Media profile) after undocking.
 2010-04-20 09:27:40 -07:00
Eric Laurent
d92e6cc4cd am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking. 
Merge commit '3b5912602bec6ccbe8eef8a576730b1565f0067c' into froyo-plus-aosp

* commit '3b5912602bec6ccbe8eef8a576730b1565f0067c':
  Fix issue 2604270  Device auto connects to Car Dock (Media profile) after undocking.
 2010-04-20 09:22:32 -07:00
Mathias Agopian
0ec1f2fc6e am 26f61635: am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo 
Merge commit '26f6163557980062dbb203388b3d0794ee0d06f7' into kraken

* commit '26f6163557980062dbb203388b3d0794ee0d06f7':
  fix [2599939] "cannot play video" after open/close a video player a dozen of times
 2010-04-19 19:29:22 -07:00
Mathias Agopian
65d8840637 am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo 
Merge commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa' into froyo-plus-aosp

* commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa':
  fix [2599939] "cannot play video" after open/close a video player a dozen of times
 2010-04-19 19:26:31 -07:00
Mathias Agopian
8288f66f0a Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo 2010-04-19 19:23:45 -07:00
Jack Palevich
4ace33e248 am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo 
Merge commit '0679876997a5523a7539b8fe2c74a39434b17820' into kraken

* commit '0679876997a5523a7539b8fe2c74a39434b17820':
  Quietly handle EGL_BAD_NATIVE_WINDOW errors
 2010-04-19 19:15:12 -07:00
Jack Palevich
3956b41a04 am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo 
Merge commit '7305f4166306dac08fc63056f2c85e91015df879' into froyo-plus-aosp

* commit '7305f4166306dac08fc63056f2c85e91015df879':
  Quietly handle EGL_BAD_NATIVE_WINDOW errors
 2010-04-19 19:10:13 -07:00
Mathias Agopian
3c772b706d fix [2599939] "cannot play video" after open/close a video player a dozen of times 
get rid off the MAP_ONCE flag is MemoryHeapBase (as well as it's functionality),
this feature should not be used anymore.

the software renderer was incorrectly using the default ctor which set MAP_ONCE,
causing the leak. the software renderer itself is incorrectly used while coming
back from sleep.

Change-Id: I123621f8d140550b864f352bbcd8a5729db12b57
 2010-04-19 19:09:03 -07:00
Jack Palevich
93bd90f80f Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo 2010-04-19 19:06:35 -07:00
Daisuke Miyakawa
592d0ec36a am e3172405: am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data. 
Merge commit 'e31724050041b4be41b7c868d531a6c00fd94587' into kraken

* commit 'e31724050041b4be41b7c868d531a6c00fd94587':
  Make vCard allow users to refrain image export. Useful when
 2010-04-19 18:59:20 -07:00
Daisuke Miyakawa
4792ad978e am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data. 
Merge commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp

* commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
  Make vCard allow users to refrain image export. Useful when
 2010-04-19 18:52:07 -07:00
Grace Kloba
6aa3b38ef3 am 8831d4dc: am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo 
Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken

* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
  Update the comment which supposed to be checked in
 2010-04-19 16:19:30 -07:00
Grace Kloba
04b287b9ff am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo 
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp

* commit '8f655cb6c836380778545fb13044d97ef57139d6':
  Update the comment which supposed to be checked in
 2010-04-19 16:15:41 -07:00
Grace Kloba
b227d97442 Merge "Update the comment which supposed to be checked in in the last CL." into froyo 2010-04-19 16:11:21 -07:00
Adam Powell
b8b2a1336f am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 
Merge commit '7f30f8abe3161ae912c3475aa89ad14388f576d7' into kraken

* commit '7f30f8abe3161ae912c3475aa89ad14388f576d7':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
 2010-04-19 15:41:05 -07:00
Adam Powell
2ea10cdb80 am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 
Merge commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47' into froyo-plus-aosp

* commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
 2010-04-19 15:38:11 -07:00
Adam Powell
6138d6b2da Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:33:08 -07:00
Robert Greenwalt
f50cb8ac5b am 2f8c9e68: am f06f2eb2: Merge "Misc fixes for throttling." into froyo 
Merge commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e' into kraken

* commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e':
  Misc fixes for throttling.
 2010-04-19 13:31:24 -07:00
Robert Greenwalt
7e06b042fb am f06f2eb2: Merge "Misc fixes for throttling." into froyo 
Merge commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768' into froyo-plus-aosp

* commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768':
  Misc fixes for throttling.
 2010-04-19 13:25:46 -07:00
Grace Kloba
344945f0ce am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 
Merge commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken

* commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7':
  Remove fixed size restriction on the SurfaceView
 2010-04-19 13:21:58 -07:00
Robert Greenwalt
464692bdcf Merge "Misc fixes for throttling." into froyo 2010-04-19 13:21:01 -07:00
Grace Kloba
9a459c80f0 am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp

* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
  Remove fixed size restriction on the SurfaceView
 2010-04-19 13:17:53 -07:00
Grace Kloba
2882ec3b0c Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:14:21 -07:00
Scott Main
98afea3937 am f57f147b: am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo 
Merge commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3' into kraken

* commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3':
  add droiddoc flag to include since-tags for api level 8
 2010-04-19 12:36:17 -07:00
Scott Main
335a889deb am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo 
Merge commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp

* commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
  add droiddoc flag to include since-tags for api level 8
 2010-04-19 12:33:18 -07:00
Scott Main
4c52abfeeb Merge "add droiddoc flag to include since-tags for api level 8" into froyo 2010-04-19 12:28:15 -07:00
Brad Fitzpatrick
dc16573d7c am bb9739c5: am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo 
Merge commit 'bb9739c5d74404b9155565f2a08509079b719a22' into kraken

* commit 'bb9739c5d74404b9155565f2a08509079b719a22':
  Reduce lock contention, removing unnecessary synchronization.
 2010-04-19 12:23:58 -07:00
Grace Kloba
73e0a4834f am 66fa5cc7: am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo 
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken

* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
  Force redraw in touch_up if there is a move.
 2010-04-19 12:23:54 -07:00
Brad Fitzpatrick
57146fd99a am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo 
Merge commit '11bea2e216800c5612144f76d307da653d565be3' into froyo-plus-aosp

* commit '11bea2e216800c5612144f76d307da653d565be3':
  Reduce lock contention, removing unnecessary synchronization.
 2010-04-19 12:22:07 -07:00
Grace Kloba
21218befb9 am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo 
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp

* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
  Force redraw in touch_up if there is a move.
 2010-04-19 12:18:22 -07:00
Brad Fitzpatrick
d2b61e9fb7 Merge "Reduce lock contention, removing unnecessary synchronization." into froyo 2010-04-19 12:17:48 -07:00
Grace Kloba
55f2967c88 Merge "Force redraw in touch_up if there is a move." into froyo 2010-04-19 12:14:41 -07:00
Brad Fitzpatrick
4d11d18af8 am 9a9b09f6: am afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo 
Merge commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b' into kraken

* commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b':
  Ease contention on the mProcessStatsThread mutex in updateCpuStats.
 2010-04-19 11:56:19 -07:00
Brad Fitzpatrick
092d5f9cba am afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo 
Merge commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp

* commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
  Ease contention on the mProcessStatsThread mutex in updateCpuStats.
 2010-04-19 11:54:05 -07:00
Brad Fitzpatrick
1da2dbe9b9 Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo 2010-04-19 11:50:53 -07:00
Irfan Sheriff
483e6a2c7e am e77bba8f: am 18920136: Merge "Reset notification state on wifi enable" into froyo 
Merge commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a' into kraken

* commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a':
  Reset notification state on wifi enable
 2010-04-19 09:59:47 -07:00
Irfan Sheriff
507affd3f5 am 18920136: Merge "Reset notification state on wifi enable" into froyo 
Merge commit '1892013643537f5fc330f5b0a02a0e9cb08b1134' into froyo-plus-aosp

* commit '1892013643537f5fc330f5b0a02a0e9cb08b1134':
  Reset notification state on wifi enable
 2010-04-19 09:55:44 -07:00
Irfan Sheriff
df609c06eb Merge "Reset notification state on wifi enable" into froyo 2010-04-19 09:50:37 -07:00
Jean-Michel Trivi
b41ca74efe am 6aa2acca: am 04152f98: Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player w 
Merge commit '6aa2accae3f58e4139f890f51c699901ee3abb88' into kraken

* commit '6aa2accae3f58e4139f890f51c699901ee3abb88':
  Fix bug 2599698 Music paused by itself
 2010-04-19 09:48:18 -07:00
Jean-Michel Trivi
0d3a670a3d am 04152f98: Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started bef 
Merge commit '04152f98ffbd17f54a6b771636ff7f440f0edc78' into froyo-plus-aosp

* commit '04152f98ffbd17f54a6b771636ff7f440f0edc78':
  Fix bug 2599698 Music paused by itself
 2010-04-19 09:45:41 -07:00
Jean-Michel Trivi
87ccfb3405 Merge "Fix bug 2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it's using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started before the listener was set. The theory about the bug is that the player finished playing before the listener was called. Therefore the audio focus was never abandonned, and the music didn't resume." into froyo 2010-04-19 09:41:19 -07:00