Commit Graph

38903 Commits

Author SHA1 Message Date
Jeff Brown
f1d3802ea2 Support for multiple tests
The build system enforces some invariants that were being ignored
before.

Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
2010-06-14 15:46:08 -07:00
Brad Fitzpatrick
4ed8e42c50 am 92dd85d0: am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '92dd85d02af60b001f1ae6919eeb11bcf38e64c8'

* commit '92dd85d02af60b001f1ae6919eeb11bcf38e64c8':
  StrictMode: implement the log-to-DropBox option
2010-06-14 15:25:09 -07:00
Brad Fitzpatrick
92dd85d02a am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '742b282e1168ed3820cb549a89753f39f4de0fa6' into gingerbread-plus-aosp

* commit '742b282e1168ed3820cb549a89753f39f4de0fa6':
  StrictMode: implement the log-to-DropBox option
2010-06-14 15:21:21 -07:00
Brad Fitzpatrick
742b282e11 Merge "StrictMode: implement the log-to-DropBox option" into gingerbread 2010-06-14 15:19:51 -07:00
Fabrice Di Meglio
0028249ad3 Merge "Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)" 2010-06-14 15:10:19 -07:00
Fabrice Di Meglio
c3cc13306c Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)
- add more properties to Calendars: selfUrl, editUrl, eventsUrl and deleted
- add CalendarsEntity and associated iterator
- cleaup interfaces definition for Calendars / Events columns by factorising  Sync and Account columns

Change-Id: I730e9d377316d458f7d225ce85966c7048ad26a9
2010-06-14 15:08:12 -07:00
Kenny
baccb91ece Fix the ssid display issue
Reproduce steps:
1. Set a special AP name that contains "=" (looks like "-=^-^=-");
2. Connect to this AP;
3. The display of ssid will be incorrect;

Change-Id: Idc7433a42cf59932f5fb147f5500e0175f745399
2010-06-14 14:51:26 -07:00
Vasu Nori
6c354da943 read old version of data and use multiple connections to db
cts tests are in Change-Id: Ifcc89b4ff484c7c810fd2d450ded212a43360dda
dependency on: Change-Id: I938c42afc3fb50f5296d01c55ffcf4a102d8b0cb

1. Use sqlite's work-in-progress writeahead logging feature to read old
     versions of data and thus increase concurrency of readers
     even when there is a writer on the database
2. New API executeQueriesInParallel() sets up a database connecion pool
     automatically created and managed by sqlite java layer
3. To increase reader concurrency, add an option to do BEGIN IMMEDIATE xaction
     instead of BEGIN EXCLUSIVE

Change-Id: I3ce55a8a7cba538f01f731736e7de8ae1e2a8a1f
2010-06-14 14:50:03 -07:00
Dianne Hackborn
c465f9c400 am 13792057: am 7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '13792057e4fef30c9b6fe2b8249b246841508164'

* commit '13792057e4fef30c9b6fe2b8249b246841508164':
  Update build version information.
2010-06-14 14:44:17 -07:00
James Dong
40287c8f11 am 814f430c: am dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
Merge commit '814f430cb5e313316600fd6694ed338edd5fff7d'

* commit '814f430cb5e313316600fd6694ed338edd5fff7d':
  Fixed a typo - maybe we should do comparison ignoring the case?
2010-06-14 14:43:57 -07:00
The Android Open Source Project
3149ad13e5 merge from open-source master
Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
2010-06-14 14:28:18 -07:00
The Android Open Source Project
c8e2cbd31a merge from open-source master
Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
2010-06-14 14:18:32 -07:00
Dianne Hackborn
13792057e4 am 7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp

* commit '7e900cbf1d600a8895e63a0247f45c116ff05172':
  Update build version information.
2010-06-14 14:13:07 -07:00
Dianne Hackborn
7e900cbf1d Merge "Update build version information." into gingerbread 2010-06-14 14:10:43 -07:00
Dianne Hackborn
3e03cfa3af Update build version information.
Change-Id: If53f16d494255230859a30f561e9a78ec49c6c10
2010-06-14 14:08:20 -07:00
Jason Sams
56985cea77 update image processing.
Change-Id: I5899f88f05b9fb2ac2d7cdcb725b97d3a48d536b
2010-06-14 14:01:33 -07:00
The Android Automerger
a0f68e94bd Merge branch 'froyo' into froyo-release 2010-06-14 14:00:37 -07:00
Jean-Baptiste Queru
9451e71cf5 Merge "Fix data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS in RIL." 2010-06-14 13:54:25 -07:00
Shih-wei Liao
1fdcb0814b Merge "To enable the reflection of rs_mesh etc. Side benefit: Better type checking. Double-checked with Nick that the extra "struct" is enabling reflection and type checking without incurring overhead." 2010-06-14 13:39:33 -07:00
Brad Fitzpatrick
143666f0ca StrictMode: implement the log-to-DropBox option
Change-Id: I51d12e264155078f953028241f8c5cbdc47262e8
2010-06-14 13:38:01 -07:00
Sen Hu
bde7570659 wire up sampling profiler to dropbox
When system property "persist.sys.profiler_hz" > 0, SamplingProfilerService is
loaded to SystemServer. It creates a FileObserver, watching any new file in the snapshot
directory. When a snapshot is found, it is put in dropbox and deleted after that.

SamplingProfilerIntegration writes snapshots with headers. Headers are <name, value> pairs,
instantiated by caller.

Currently header format is (also in source comment):

Version: <version number of profiler>\n
Process: <process name>\n
Package: <package name, if exists>\n
Package-Version: <version number of the package, if exists>\n
Build: <fingerprint>\n
\n
<the actual snapshot content begins here...>

BUG=2732642

Change-Id: I2c1699f1728e603de13dbd38f9d8443cd3eecc06
2010-06-14 13:27:01 -07:00
James Dong
814f430cb5 am dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
Merge commit 'dca66e1c3bc8842b0d44e0cb004e507a456e4b8f' into gingerbread-plus-aosp

* commit 'dca66e1c3bc8842b0d44e0cb004e507a456e4b8f':
  Fixed a typo - maybe we should do comparison ignoring the case?
2010-06-14 13:20:54 -07:00
Scott Main
7ef674b596 docs: add information about known issues in resource matching
for screen density and system version.
Add section about providing compatibility for multiple devices

bug: 2760561

Change-Id: I9b3a515a14d53923a15b1931f6dd24f295874362
2010-06-14 12:57:54 -07:00
Jean-Baptiste Queru
58424b59fa Merge "Corrected SPN and PLMN name handling" 2010-06-14 12:47:49 -07:00
The Android Open Source Project
e377032899 am 864c68ea: merge from froyo-plus-aosp
Merge commit '864c68ea452baa0f4f298faf2155af45a9b6d60c'

* commit '864c68ea452baa0f4f298faf2155af45a9b6d60c':
  Added an addAll to the ArrayAdapter
  WLAN: Reset power save mode to startup value after DHCP response.
  Add PageUp and PageDown hot keys
  Should accept "application/vnd.wap.multipart.alternative" message.
  replaced deprecated getIntent with parseURI
2010-06-14 11:39:26 -07:00
The Android Open Source Project
864c68ea45 merge from froyo-plus-aosp
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
2010-06-14 11:35:51 -07:00
James Dong
dca66e1c3b Fixed a typo - maybe we should do comparison ignoring the case?
Change-Id: I498f8242e6ba3e3e8b8c7b714ed49bff51a3010b
2010-06-14 11:14:38 -07:00
The Android Open Source Project
d7b814188d merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
2010-06-14 11:07:32 -07:00
The Android Open Source Project
51a9839ec6 merge from open-source master
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
2010-06-14 11:06:33 -07:00
The Android Open Source Project
0d4dc714f9 merge from open-source master
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
2010-06-14 11:02:30 -07:00
The Android Open Source Project
ea1647aff1 merge from open-source master
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
2010-06-14 10:57:53 -07:00
Jean-Baptiste Queru
4bd0073299 Merge "replaced deprecated getIntent with parseURI" 2010-06-14 10:28:23 -07:00
Brad Fitzpatrick
26b327c80b am 6b9b8806: am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '6b9b8806afb06e393203450bda8a53af08952590'

* commit '6b9b8806afb06e393203450bda8a53af08952590':
  Dropbox: remove redundant Entry construction.
2010-06-14 09:36:12 -07:00
Brad Fitzpatrick
6b9b8806af am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a' into gingerbread-plus-aosp

* commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a':
  Dropbox: remove redundant Entry construction.
2010-06-14 09:34:22 -07:00
Steve Block
dbf72e21a4 Merge "Add the basic outline of the web runtime used to display installed web applications" 2010-06-14 09:32:38 -07:00
Brad Fitzpatrick
60e8c33d6f Merge "Dropbox: remove redundant Entry construction." into gingerbread 2010-06-14 09:32:26 -07:00
Jean-Baptiste Queru
5978bcc32b Merge "Added an addAll to the ArrayAdapter" 2010-06-14 09:27:14 -07:00
Mike Lockwood
44cf0a0682 MTP: Fix uninitialized pointer bug.
Change-Id: Ia07ebd48aeb483e66957f5a174992d200494a744
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-14 09:13:11 -07:00
Eric Laurent
7f5ee3b58d am 184a3ff6: am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '184a3ff64ba71e7e860b70b9a836c0132b447138'

* commit '184a3ff64ba71e7e860b70b9a836c0132b447138':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:10:32 -07:00
Eric Laurent
184a3ff64b am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit 'e0219539c6c3e60de4a35cd836df3b68c963e9e0' into gingerbread-plus-aosp

* commit 'e0219539c6c3e60de4a35cd836df3b68c963e9e0':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:07:03 -07:00
Eric Laurent
e0219539c6 am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '01f7ac64488027492b2909b99d70491e7a391015' into gingerbread

* commit '01f7ac64488027492b2909b99d70491e7a391015':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:04:33 -07:00
Eric Laurent
01f7ac6448 Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken 2010-06-14 09:02:13 -07:00
Brad Fitzpatrick
14418945bd Dropbox: remove redundant Entry construction.
Change-Id: I55d8da82acea7f1cf0a69912fe5d4d46d704b570
2010-06-14 08:58:26 -07:00
Steve Block
4deb139b8e Add the basic outline of the web runtime used to display installed web applications
This is still a work in progress.

Bug: 2766920

Change-Id: I2d3dd4b3b88bf84d8d66386e43a21c4085627c4d
2010-06-14 16:58:10 +01:00
Jean-Baptiste Queru
a2e2d20256 Merge "Should accept "application/vnd.wap.multipart.alternative" message." 2010-06-14 08:56:49 -07:00
Chih-Chung Chang
a47078a5b0 am da755ad3: am f1cefa91: am 724c5224: Correct the setDisplayOrientation sample code.
Merge commit 'da755ad331aa77fb3780b84c384a27d0217bf410'

* commit 'da755ad331aa77fb3780b84c384a27d0217bf410':
  Correct the setDisplayOrientation sample code.
2010-06-14 04:17:59 -07:00
Chih-Chung Chang
da755ad331 am f1cefa91: am 724c5224: Correct the setDisplayOrientation sample code.
Merge commit 'f1cefa916712dafc8b47f6eb8132a688892d4995' into gingerbread-plus-aosp

* commit 'f1cefa916712dafc8b47f6eb8132a688892d4995':
  Correct the setDisplayOrientation sample code.
2010-06-14 04:14:09 -07:00
Chih-Chung Chang
f1cefa9167 am 724c5224: Correct the setDisplayOrientation sample code.
Merge commit '724c52244423feced2677fbd1f905e0b8b0639f2' into gingerbread

* commit '724c52244423feced2677fbd1f905e0b8b0639f2':
  Correct the setDisplayOrientation sample code.
2010-06-14 04:11:00 -07:00
Chih-Chung Chang
724c522444 Correct the setDisplayOrientation sample code.
Change-Id: I37af4090b383204a5fd228a4388732e11ef2fa8c
2010-06-14 19:07:17 +08:00
Jeff Brown
d983a25b25 am 4166aec5: am 28a6c8e9: am d890cbf7: Remove PollLoop from host build.
Merge commit '4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b'

* commit '4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b':
  Remove PollLoop from host build.
2010-06-13 20:28:29 -07:00