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

15334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d8fdbf241f am 49ee271b: am cb2906e4: am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo 2010-04-16 13:38:57 -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
0fd117187f am ffeeed9c: am 329a5214: merge from open-source master 2010-04-16 12:57:33 -07:00
Jake Hamby
86de779e4d Merge "Spelling corrections and other minor cosmetic cleanups." 2010-04-16 12:52:31 -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
a97f47a0d7 am 3edf3a56: am e0a40686: am f066611a: retool resize logic to use max dimension and max area. 2010-04-16 12:35:26 -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
654bfc7021 am 5fee638e: 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 2010-04-16 07:36:13 -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
98a0126433 am 48b8b4fd: Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken 2010-04-15 20:34:03 -07:00
Mike Lockwood
6a77834e7e am ad903e80: Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken 2010-04-15 20:33:58 -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
7b0ffaae2f am 318249e4: Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken 2010-04-15 18:01:32 -07:00
Jim Miller
03e65f797e Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken 2010-04-15 17:55:18 -07:00
Jim Miller
45e232aaca am 43725d4d: Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken 2010-04-15 17:51:30 -07:00
Robert Greenwalt
99e66ce548 am 9e17d740: am 32ebaf57: am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo 2010-04-15 17:51:26 -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
Ben Murdoch
6059445b8e Merge "Reset the webview settings after each test to ensure that each new test starts in a consistent, known state. This fixes a bug for example with the appcache tests, where disable.html turns off appcache support but it is never restored causing future tests to fail." 2010-04-15 17:08:04 -07:00
android-build SharedAccount
355479ff36 manual merge 
Change-Id: I235ae925559b5db6d64cc8f8b188704a84d7b6a2
 2010-04-15 16:36:34 -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
Shimeng (Simon) Wang
eae48c7a18 Merge "Convert obsolete language codes to new standards in Accept-Language and User-Agent." 2010-04-15 14:36:28 -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
Mathias Agopian
074ac04f3b am 24af70e8: am e7d5a2f9: am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo 2010-04-15 12:34:56 -07:00
Suchi Amalapurapu
83cb2bac04 am 180ee659: am 1e21ec92: am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyo 2010-04-15 12:34:47 -07:00
Mike Lockwood
b8693d7721 am 63aa5a6f: clear calling identity in GpsLocationProvider.sendExtraCommand(). 2010-04-15 12:34:15 -07:00
Mike Lockwood
29cb5a7338 am a3d2d769: GpsStatus: Bounds check PRN to avoid array indexing exceptions. 2010-04-15 12:34:08 -07:00
Mike Lockwood
01d403fa28 am 04598b67: GPS: Support for GPS HAL managing its own scheduling 2010-04-15 12:34:01 -07:00
Mike Lockwood
c55dfabc81 am f440b4aa: Merge "GpsLocationProvider: optimize wake lock usage." into kraken 2010-04-15 12:33:49 -07:00
Patrick Scott
2707eccbd1 am 56645e26: Merge branch \'kraken\' of ssh://android-git:29418/platform/frameworks/base into kraken 2010-04-15 12:33:41 -07:00
Vasu Nori
7598c14471 am 9d3b3e13: am bad5f620: am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo 2010-04-15 12:33:34 -07:00
Grace Kloba
0564d63bb6 am 8579f211: am e35a45b7: am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo 2010-04-15 12:33:26 -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