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

15355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
297777cd5d am 8987f110: am c2093636: am 7171ea81: Make ThrottleService more tamper resistant. 2010-04-18 12:43:11 -07:00
Robert Greenwalt
a6e0927d49 am c2093636: am 7171ea81: Make ThrottleService more tamper resistant. 
Merge commit 'c2093636db6141426ca7fe88f07b30a284e36759' into kraken

* commit 'c2093636db6141426ca7fe88f07b30a284e36759':
  Make ThrottleService more tamper resistant.
 2010-04-18 12:35:10 -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
fffa14283f am c2477a92: am 2572b046: am 975d86df: Merge "Dont check on interface value on API" into froyo 2010-04-17 09:44:58 -07:00
Irfan Sheriff
9b72f05f2a am 2572b046: am 975d86df: Merge "Dont check on interface value on API" into froyo 
Merge commit '2572b046d64a2d0b43d74870e1e899364f2bc721' into kraken

* commit '2572b046d64a2d0b43d74870e1e899364f2bc721':
  Dont check on interface value on API
 2010-04-17 09:36:44 -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
7381f5ac25 am eb94c44c: am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo 2010-04-16 17:22:51 -07:00
Scott Main
72e0d14e01 resolved conflicts for merge of 45703007 to master 
Change-Id: Ib340803fe7ff4bea79d873a5f58ca3202889c7d3
 2010-04-16 17:20:05 -07:00
Grace Kloba
1d75e33362 am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo 
Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken

* commit '17e36d233dff7178e60d841a650d9bef5d0af93c':
  Missed a case to resumeUpdatePicture.
 2010-04-16 16:40:54 -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
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
cf96d61002 am 81a47198: am a9ea147d: merge from open-source master 2010-04-16 15:26:01 -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
84a3284fbd am 99d43435: am 66bee813: am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo 2010-04-16 15:04:16 -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
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