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

14797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
1c63d5fb71 am 71786ceb: am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo 
Merge commit '71786ceb8ce91d209b974f899e7f9c66f57afacd' into kraken

* commit '71786ceb8ce91d209b974f899e7f9c66f57afacd':
  cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54
 2010-04-16 16:21:58 -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
e599c7e02a am a9ea147d: merge from open-source master 
Merge commit 'a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf' into kraken

* commit 'a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf':
  Unify am startservice commands.
 2010-04-16 15:21:38 -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
1ee4985495 am 66bee813: am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo 
Merge commit '66bee81321f16a3268adc43f5f87fcfbf8c27290' into kraken

* commit '66bee81321f16a3268adc43f5f87fcfbf8c27290':
  accept close() on database objects even if the database is closed
 2010-04-16 14:57:26 -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
974073a3b5 am cb2906e4: am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo 
Merge commit 'cb2906e4bbb96b0be83029572a78f97dc6763eca' into kraken

* commit 'cb2906e4bbb96b0be83029572a78f97dc6763eca':
  Add command line flags to enable lock profiling.
 2010-04-16 13:31:39 -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
2a5384756a am 329a5214: merge from open-source master 
Merge commit '329a52141c52e15caf4f0dba1735857c4ef4d478' into kraken

* commit '329a52141c52e15caf4f0dba1735857c4ef4d478':
  Allow Am to start services
 2010-04-16 12:50:54 -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
add9e7fe76 am e0a40686: am f066611a: retool resize logic to use max dimension and max area. 
Merge commit 'e0a4068640cff64abcd3a70395ad461919b15ea6' into kraken

* commit 'e0a4068640cff64abcd3a70395ad461919b15ea6':
  retool resize logic to use max dimension and max area.
 2010-04-16 12:26:52 -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
69a40bb542 am f04be52a: 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 'f04be52a382544ff8006e227c1578a219ba0f23e' into kraken

* commit 'f04be52a382544ff8006e227c1578a219ba0f23e':
  For search suggestions in the search dialog, allow the 'title'
 2010-04-16 07:30:18 -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
Mike Lockwood
77654400c2 Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken 2010-04-15 20:26:33 -07:00
Mike Lockwood
327117d795 Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken 2010-04-15 20:26:09 -07:00
Jim Miller
03e65f797e Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken 2010-04-15 17:55:18 -07:00
Jim Miller
e6a66462e4 Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken 2010-04-15 17:47:01 -07:00
Robert Greenwalt
a54fb4f4c0 am 32ebaf57: am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo 
Merge commit '32ebaf57d8646542b80e848441830a5ef834aed3' into kraken

* commit '32ebaf57d8646542b80e848441830a5ef834aed3':
  Add multi-sim support to ThrottleService.
 2010-04-15 17:45:26 -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
Mathias Agopian
a0a7115f42 Merge "when a zero dimension buffer is allocated, turn the allocation into a 1x1 buffer instead of Nx1 (or 1xN)" into kraken 2010-04-15 15:24:35 -07:00
Mathias Agopian
5629eb1676 when a zero dimension buffer is allocated, turn the allocation into 
a 1x1 buffer instead of Nx1 (or 1xN)

Change-Id: I27eeb15e83e13002dd9405f4e52b54f7dffc0fe7
 2010-04-15 15:23:25 -07:00
Dianne Hackborn
4369bc5835 Merge "Introduce new API version to avoid breakage with the Froyo APIs; introduce padding in the resources to avoid cross-branch merge pain." into kraken 2010-04-15 14:41:13 -07:00
Dianne Hackborn
f70f7d043f am 292bdbd9: am e3094117: Merge "A little more improvement of the Service javadoc." into froyo 
Merge commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken

* commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
  A little more improvement of the Service javadoc.
 2010-04-15 13:39:16 -07:00
Robert Greenwalt
0ac81b9e7a am d65d5f11: am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo 
Merge commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken

* commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72':
  Fix SntpClient to give accurate time info.
 2010-04-15 13:37:31 -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
0a7b355da9 am 7a4b22f6: am 4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA. 
Merge commit '7a4b22f6293c7dce2dd667b7ebd171af2eff91a9' into kraken

* commit '7a4b22f6293c7dce2dd667b7ebd171af2eff91a9':
  Remove native binaries when an updated system application is upgraded through OTA.
 2010-04-15 12:23:59 -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
ace7ec4c2f am 2349dc5d: am fa22de79: Merge "Import revised translations" into froyo 
Merge commit '2349dc5d7aac9c0bde9fc38f69114db0f38ed319' into kraken

* commit '2349dc5d7aac9c0bde9fc38f69114db0f38ed319':
  Import revised translations
 2010-04-15 06:43:29 -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
9f03441b38 am f5a886d5: am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 
Merge commit 'f5a886d5210320724236ce6efde926e0a3c24997' into kraken

* commit 'f5a886d5210320724236ce6efde926e0a3c24997':
  Fix wakelock leak in PowerManagerService.sendNotificationLocked()
 2010-04-15 05:53:05 -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
Dianne Hackborn
4dd113a270 am ded77760: am 90d3f458: API 8! 
Merge commit 'ded77760d1135cdc76f7c1fdf0e156165c1aeaf3' into kraken

* commit 'ded77760d1135cdc76f7c1fdf0e156165c1aeaf3':
  API 8!
 2010-04-14 22:31:06 -07:00
Dianne Hackborn
7230aea611 am 90d3f458: API 8! 
Merge commit '90d3f458d99d9c0f35f9ee295997661c2493cb58' into froyo-plus-aosp

* commit '90d3f458d99d9c0f35f9ee295997661c2493cb58':
  API 8!
 2010-04-14 22:27:10 -07:00
Robert Greenwalt
ed5100411a am 1424d1d2: am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 
Merge commit '1424d1d22e199c716c5d248611e58ce7c3f15c7e' into kraken

* commit '1424d1d22e199c716c5d248611e58ce7c3f15c7e':
  Sholes mobile iface comes/goes - handle the reset
 2010-04-14 20:30:31 -07:00
Suchi Amalapurapu
8a7ff1f3a9 am 0751d1ea: am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well. 
Merge commit '0751d1eaad55603eaeb0f035a55935f713ab0476' into kraken

* commit '0751d1eaad55603eaeb0f035a55935f713ab0476':
  Revert "Add ordered broadcast when removing packages."
 2010-04-14 20:30:27 -07:00
Robert Greenwalt
1db843f251 am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 
Merge commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp

* commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729':
  Sholes mobile iface comes/goes - handle the reset
 2010-04-14 20:25:51 -07:00
Suchi Amalapurapu
eaf56ded1b am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well. 
Merge commit 'deb69370ef9a786940ae49411ba657410361b4f1' into froyo-plus-aosp

* commit 'deb69370ef9a786940ae49411ba657410361b4f1':
  Revert "Add ordered broadcast when removing packages."
 2010-04-14 20:25:48 -07:00
Robert Greenwalt
8ae5bf5e2c Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 2010-04-14 20:23:45 -07:00
Dianne Hackborn
27f962f985 am 68ca59e9: am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo 
Merge commit '68ca59e9e69ab4c997987fb0390382a2461386eb' into kraken

* commit '68ca59e9e69ab4c997987fb0390382a2461386eb':
  Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
 2010-04-14 19:09:52 -07:00