Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,771 Commits 3 Branches 0 Tags
8d64c9bbcef14f94dc3fe41e69a54ba3ec0222cf
Commit Graph

23771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
8d64c9bbce Merge "Exclude mtptest program from simulator builds." 2010-05-13 13:29:28 -07:00
Mike Lockwood
18ff7b4c37 Exclude mtptest program from simulator builds. 
Change-Id: Ia9751a06d7607363e8c16b71f6f3c524833395a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-13 16:28:00 -04:00
Jaikumar Ganesh
a5a51a76b2 Merge "resolved conflicts for merge of 0de3cc9b to master" 2010-05-13 12:43:50 -07:00
Jaikumar Ganesh
fce9609a18 resolved conflicts for merge of 0de3cc9b to master 
Change-Id: I9fcf892de6ebe90c6a4be19d02e3a009ddda89aa
 2010-05-13 12:42:59 -07:00
Mike Lockwood
56118b5b38 Checkpoint work on MTP and PTP investigation. 
This change includes work in progress on a C++ library for both host and device
MTP and PTP support.
Currently the makefile builds two test programs:

mtptest - a command line test program that implements a small subset of device side MTP.
Requires a kernel driver that has not been checked in yet.

ptptest - a host tool to test USB host support for detecting and communicating with
digital cameras over PTP.  Runs on Linux host.

Later this will be reformulated as a native library that will be used in the media process.

Change-Id: I81aab279975b600b59d99013ab97f9adf0b58da7
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-13 15:36:47 -04:00
Jaikumar Ganesh
0de3cc9b5e am 54a8f295: Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken 2010-05-13 12:22:05 -07:00
Jaikumar Ganesh
54a8f29523 Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken 2010-05-13 12:20:06 -07:00
Jason Sams
f6860f1979 Merge "Add missing bindProgramRaster to scriptC_lib." 2010-05-13 12:19:28 -07:00
Andreas Huber
05a5205b93 am 9df829bf: am fae47fd0: am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 2010-05-13 11:34:40 -07:00
Andreas Huber
9df829bf58 am fae47fd0: am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 2010-05-13 11:33:06 -07:00
Andreas Huber
fae47fd008 am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 
Merge commit '28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken

* commit '28fadef2ede2d74e9526266e779553bbd1dc66f4':
  Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
 2010-05-13 11:18:24 -07:00
Andreas Huber
28fadef2ed am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 
Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp

* commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b':
  Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
 2010-05-13 11:16:43 -07:00
Adam Powell
bdfb5312c0 Merge "ActionBar added to framework, integrated with Activity and styles. Added onClick attribute support to menus in MenuInflater." 2010-05-13 11:07:58 -07:00
The Android Open Source Project
6df9720b8d am fd5b040a: am 485b800e: am 1a3b3d48: merge from open-source master 2010-05-13 09:57:11 -07:00
The Android Open Source Project
fd5b040ae7 am 485b800e: am 1a3b3d48: merge from open-source master 2010-05-13 09:54:44 -07:00
The Android Open Source Project
485b800eac am 1a3b3d48: merge from open-source master 
Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken

* commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4':
  Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
 2010-05-13 09:53:16 -07:00
Steve Block
8b913e8ea5 Merge "Adds excessive-comma-usage.html to DumpRenderTree skipped list as it causes OOM" 2010-05-13 09:43:44 -07:00
Steve Block
f27d7fbac8 Adds excessive-comma-usage.html to DumpRenderTree skipped list as it causes OOM 
Change-Id: I4581eeda494797616b9881d47cc53eccf21456c9
 2010-05-13 17:40:12 +01:00
Andreas Huber
3c78a1b589 Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 
Change-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a
related-to-bug: 2682221
QA-impact: none
 2010-05-13 09:19:35 -07:00
Eric Laurent
6dd5f73e8c am 06a237b0: am ca20104a: Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." into kraken 2010-05-13 09:19:09 -07:00
Eric Laurent
bd62a9eb6e am 76a95619: am c247328d: Merge "Several fixes in AudioDumpInterface:" into kraken 2010-05-13 09:19:05 -07:00
Eric Laurent
06a237b0bd am ca20104a: Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." into kraken 2010-05-13 09:17:30 -07:00
Eric Laurent
76a956192b am c247328d: Merge "Several fixes in AudioDumpInterface:" into kraken 2010-05-13 09:17:23 -07:00
The Android Open Source Project
1a3b3d4841 merge from open-source master 
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
 2010-05-13 09:04:45 -07:00
Kenny Root
193ca06e06 Merge "Add @hide tag to fix SDK build" 2010-05-13 06:26:17 -07:00
Kenny Root
dfd550d44c Add @hide tag to fix SDK build 
Previous Canvas changes missed a @hide tag, so droiddoc was complaining
about a missing method since that was also hidden.

Change-Id: Ib70a9fa2e20fe32b74ba901bb289e77583164004
 2010-05-13 06:21:41 -07:00
Adam Powell
33b974393b ActionBar added to framework, integrated with Activity and styles. 
Added onClick attribute support to menus in MenuInflater.

Change-Id: I739771b4f249d87a0d8b15969f3d526b099067a1
 2010-05-13 01:27:59 -07:00
Eric Laurent
ca20104a3a Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." into kraken 2010-05-12 23:40:28 -07:00
Eric Laurent
c247328dfd Merge "Several fixes in AudioDumpInterface:" into kraken 2010-05-12 23:21:42 -07:00
Jesse Wilson
c8f503b528 Moving junit out of core.jar and into core-junit.jar. 
Change-Id: I38b585044aaa0f0ef5a243a33d942ab0e490f8f1
 2010-05-12 22:05:07 -07:00
Kenny Root
5d8636dbad Merge "Modify Canvas drawText to run bidi and shape." 2010-05-12 19:34:01 -07:00
Costin Manolache
2b6b835196 am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:12:53 -07:00
Costin Manolache
0c6028c10a am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:11:34 -07:00
Costin Manolache
c195965893 am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken

* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
  Bug 2680071: Rename the Cloud to Device
 2010-05-12 19:10:01 -07:00
Costin Manolache
fa2e3dcd85 am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
 2010-05-12 19:06:39 -07:00
Costin Manolache
8ea9f130d2 Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:04:27 -07:00
Doug Felt
f47d7405bb Modify Canvas drawText to run bidi and shape. 
Adds drawTextRun as internal API on Canvas and GraphicsOperations.
Adds implementation to implementors of GraphicsOperations.

Adds state and API on Paint to control the bidi algorithm when used
by Canvas.  This API is currently hidden.

The drawText changes are incomplete since shaping is not yet available
in the native code.

Change-Id: I4368048aef9545df0953a349381771603e04b619
 2010-05-12 18:50:02 -07:00
Mathias Agopian
d937420996 am 6b5233de: am 75181b42: another attempt at fixing the build 2010-05-12 18:41:56 -07:00
Mathias Agopian
6b5233dedf am 75181b42: another attempt at fixing the build 2010-05-12 18:39:33 -07:00
Mathias Agopian
75181b42c9 another attempt at fixing the build 
Change-Id: I80b498d1bbb8f9ffcec4f27802be7ae9977f70ac
 2010-05-12 18:37:43 -07:00
Mathias Agopian
8aa3d7d8a1 am fb6bd833: am 7406eafe: should fix the build 2010-05-12 18:31:51 -07:00
Mathias Agopian
fb6bd833ea am 7406eafe: should fix the build 2010-05-12 18:29:34 -07:00
Jason Sams
0c677318b5 Add missing bindProgramRaster to scriptC_lib. 
Change-Id: I06a7075a94ef907478f986b59ded4ff3e2766585
 2010-05-12 18:26:52 -07:00
Mathias Agopian
7406eafe7f should fix the build 
Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
 2010-05-12 18:26:13 -07:00
Mathias Agopian
b81f6c4c3f am 19f64314: am 2f0e6753: Merge "SharedBufferStack now can grow up to 16 buffers." into kraken 2010-05-12 18:04:39 -07:00
Mathias Agopian
55c97878c0 am e0630ae3: am 6a70cb8a: Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken 2010-05-12 18:04:33 -07:00
Mathias Agopian
74c932d973 am 32286409: am ca64ed6a: Merge "remove the "memcpy" hack" into kraken 2010-05-12 18:04:28 -07:00
Konstantin Lopyrev
0dc407f9a6 Merge "Fix 2673731: Added password history" 2010-05-12 18:01:41 -07:00
Yuncheol Heo
8b70c9c1db Pick the default IME in case of a fresh install. 
Bug: 2661261

Change-Id: Id8077ffddd8ddc5c3d3fd371afaad63698ef8d9e
 2010-05-13 09:45:27 +09:00
Mathias Agopian
19f64314c6 am 2f0e6753: Merge "SharedBufferStack now can grow up to 16 buffers." into kraken 2010-05-12 17:38:53 -07:00