ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
14,116 Commits 2 Branches 0 Tags 54 MiB
4792ad978e
Commit Graph

14116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Mike Lockwood
fe6e6cd7d5 am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo 
Merge commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp

* commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
  Fix inconsistency in how we handle light sensor when battery is low.
 2010-04-19 08:22:39 -07:00
Mike Lockwood
dc5f45d2cd Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo 2010-04-19 08:18:58 -07:00
Robert Greenwalt
c5d2fecba0 am 7171ea81: Make ThrottleService more tamper resistant. 
Merge commit '7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp

* commit '7171ea8179e09270e4d6ab825a2320816eee39c5':
  Make ThrottleService more tamper resistant.
 2010-04-18 12:27:03 -07:00
Irfan Sheriff
e228704504 am 975d86df: Merge "Dont check on interface value on API" into froyo 
Merge commit '975d86dfc6407314491a18bc715c8c95a8f8f0b1' into froyo-plus-aosp

* commit '975d86dfc6407314491a18bc715c8c95a8f8f0b1':
  Dont check on interface value on API
 2010-04-17 09:31:19 -07:00
Irfan Sheriff
e0dc11825f Merge "Dont check on interface value on API" into froyo 2010-04-17 09:27:25 -07:00
Grace Kloba
b087fe8427 am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo 
Merge commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34' into froyo-plus-aosp

* commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34':
  Missed a case to resumeUpdatePicture.
 2010-04-16 16:38:25 -07:00
Grace Kloba
7e653fb246 Merge "Missed a case to resumeUpdatePicture." into froyo 2010-04-16 16:34:43 -07:00
Scott Main
65db994ad3 am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo 
Merge commit '0df87c0653fc9e8425643a10cd71594a962fab8d' into froyo-plus-aosp

* commit '0df87c0653fc9e8425643a10cd71594a962fab8d':
  cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54
 2010-04-16 16:17:55 -07:00
Scott Main
f3401a3e85 Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo 2010-04-16 16:14:33 -07:00
The Android Open Source Project
4a7c89014b merge from open-source master 
Change-Id: I050a2b6f3d09f079a50491aeabb86b242a59d647
 2010-04-16 15:18:28 -07:00
Vasu Nori
10d5bfb0f3 am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo 
Merge commit '1fc46c623f9af8aaccfd519ece78331d9a95e579' into froyo-plus-aosp

* commit '1fc46c623f9af8aaccfd519ece78331d9a95e579':
  accept close() on database objects even if the database is closed
 2010-04-16 14:53:32 -07:00
Vasu Nori
61e1476f59 Merge "accept close() on database objects even if the database is closed" into froyo 2010-04-16 14:48:47 -07:00
Carl Shapiro
a0cf170b63 am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo 
Merge commit 'd5a873fbe8df67e86990969b6729db0079bbc278' into froyo-plus-aosp

* commit 'd5a873fbe8df67e86990969b6729db0079bbc278':
  Add command line flags to enable lock profiling.
 2010-04-16 13:28:23 -07:00
Carl Shapiro
46b99505a2 Merge "Add command line flags to enable lock profiling." into froyo 2010-04-16 13:25:03 -07:00
The Android Open Source Project
3d95a00b2c merge from open-source master 
Change-Id: I93512089253f00b3da1e31f8b5f4d6e72fae8dc4
 2010-04-16 12:46:21 -07:00
Mike Reed
1fdcb1723b am f066611a: retool resize logic to use max dimension and max area. 
Merge commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a' into froyo-plus-aosp

* commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a':
  retool resize logic to use max dimension and max area.
 2010-04-16 12:24:09 -07:00
Mike LeBeau
4b54ad047a am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo 
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp

* commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
  For search suggestions in the search dialog, allow the 'title'
 2010-04-16 07:27:34 -07:00
Mike LeBeau
5ed86e4c8a Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo 2010-04-16 07:23:12 -07:00
Robert Greenwalt
600f5d2492 am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo 
Merge commit 'e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp

* commit 'e80c6f49d5055e299b7ada91b5967feab66e467b':
  Add multi-sim support to ThrottleService.
 2010-04-15 17:42:24 -07:00
Robert Greenwalt
c3a26bfeb0 Merge "Add multi-sim support to ThrottleService." into froyo 2010-04-15 17:37:55 -07:00
Dianne Hackborn
e1475461d2 am e3094117: Merge "A little more improvement of the Service javadoc." into froyo 
Merge commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp

* commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
  A little more improvement of the Service javadoc.
 2010-04-15 13:36:44 -07:00
Dianne Hackborn
e0cae12b5b Merge "A little more improvement of the Service javadoc." into froyo 2010-04-15 13:33:21 -07:00
Robert Greenwalt
6eb61296bc am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo 
Merge commit 'bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp

* commit 'bf943f296864d9647268fb5a55805ebf1fcba173':
  Fix SntpClient to give accurate time info.
 2010-04-15 13:33:03 -07:00
Robert Greenwalt
d3fd93b8e0 Merge "Fix SntpClient to give accurate time info." into froyo 2010-04-15 13:28:43 -07:00
David 'Digit' Turner
9c66aa09e7 am 4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA. 
Merge commit '4f99e3c28449833b10ee23c538246847fdb6a498' into froyo-plus-aosp

* commit '4f99e3c28449833b10ee23c538246847fdb6a498':
  Remove native binaries when an updated system application is upgraded through OTA.
 2010-04-15 12:19:23 -07:00
Kenny Root
05a192dbe2 am fa22de79: Merge "Import revised translations" into froyo 
Merge commit 'fa22de7993f94d338330a888bdc2aeaaf857c719' into froyo-plus-aosp

* commit 'fa22de7993f94d338330a888bdc2aeaaf857c719':
  Import revised translations
 2010-04-15 06:00:18 -07:00
Kenny Root
bb87a93aff Merge "Import revised translations" into froyo 2010-04-15 05:55:00 -07:00
Mike Lockwood
7d34b4dcb9 am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 
Merge commit '93597ed1839de164c81f83832d4c2373ea32ac8f' into froyo-plus-aosp

* commit '93597ed1839de164c81f83832d4c2373ea32ac8f':
  Fix wakelock leak in PowerManagerService.sendNotificationLocked()
 2010-04-15 05:48:26 -07:00
Mike Lockwood
c1f32b0390 Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 2010-04-15 05:45:21 -07:00