drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,018 Commits 1 Branch 0 Tags
Commit Graph

23018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
e0abb37a7b am bfcbd9a9: am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:36:17 -07:00
Dirk Dougherty
bfcbd9a9e1 am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 
Merge commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken

* commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad':
  Doc change: adjustments for ndk feature description
 2010-05-13 21:34:31 -07:00
Dirk Dougherty
d48e0382c3 am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 
Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp

* commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
  Doc change: adjustments for ndk feature description
 2010-05-13 21:32:21 -07:00
Dirk Dougherty
fb473bb611 Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:31:10 -07:00
Dirk Dougherty
86c74a2f9f am d91ac162: am d317edab: am a0711e7b: Doc change: Add compatibility article. 2010-05-13 21:30:19 -07:00
Dirk Dougherty
346930b74d Doc change: adjustments for ndk feature description 
Change-Id: I3eb35c3d5ad756b7fa71c256b531f262e7940d90
 2010-05-13 21:28:45 -07:00
Dirk Dougherty
d91ac162d1 am d317edab: am a0711e7b: Doc change: Add compatibility article. 
Merge commit 'd317edabe158312981eb73355f77c36566d89627' into kraken

* commit 'd317edabe158312981eb73355f77c36566d89627':
  Doc change: Add compatibility article.
 2010-05-13 21:28:34 -07:00
Dirk Dougherty
d317edabe1 am a0711e7b: Doc change: Add compatibility article. 
Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp

* commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99':
  Doc change: Add compatibility article.
 2010-05-13 21:26:22 -07:00
Dirk Dougherty
a0711e7b39 Doc change: Add compatibility article. 
Change-Id: Ie6671813eb88bc8cb92575726f8fcf69eb558d08
 2010-05-13 21:22:44 -07:00
James Dong
79dfb67531 am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:41:50 -07:00
James Dong
ffd104a903 Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:40:19 -07:00
Suchi Amalapurapu
8e8bb02f3d am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:07:50 -07:00
Suchi Amalapurapu
3f5ed04f7f am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 
Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken

* commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810':
  Fix 2672155
 2010-05-13 16:05:54 -07:00
Suchi Amalapurapu
b63ea5f784 am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp

* commit 'c928a11e34678296511d5ea34582292be7368618':
  Fix 2672155
 2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
c928a11e34 Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:02:20 -07:00
Suchi Amalapurapu
1ace5bc070 Fix 2672155 
Check the code path when enabling disabling packages.

Add unit test

Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
 2010-05-13 15:48:39 -07:00
Nick Kralevich
c5fdcaa229 am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:37:16 -07:00
Nick Kralevich
cf67d18a1d Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:35:48 -07:00
Nick Kralevich
79290ae976 Get rid of warnings when compiled with -Wformat-security 
Change-Id: I5a7ad5be2aaf0fa0d164204d3c1bebf02ec55745
 2010-05-13 15:31:00 -07:00
The Android Open Source Project
1331ded8fe am e28776bb: am b1110149: merge from open-source master 2010-05-13 14:57:20 -07:00
The Android Open Source Project
e28776bbd7 am b1110149: merge from open-source master 
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken

* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
  Use integer for loop counter instead of float
  New test in FrameworkTest for the VelocityTracker class
  Preserve '+' in phone numbers imported from SIM.
 2010-05-13 14:56:02 -07:00
The Android Open Source Project
b1110149cc merge from open-source master 
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
 2010-05-13 14:50:16 -07:00
Mike Lockwood
702b8752a5 am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 2010-05-13 14:08:05 -07:00
Mike Lockwood
5a9cbb291f am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken

* commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
 2010-05-13 14:06:25 -07:00
Mike Lockwood
a3d5549c80 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
 2010-05-13 14:04:30 -07:00
Mike Lockwood
098e58da93 Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-13 16:29:49 -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
Kenny Root
b79781af1e Use integer for loop counter instead of float 
Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b
 2010-05-13 12:17:15 -07:00
James Dong
e292b3bc9c Remove dummy surface in CameraSource 
bug - 2680919

Change-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f
 2010-05-13 12:08:29 -07:00
Jean-Baptiste Queru
9ef0f0d9d2 Merge "New test in FrameworkTest for the VelocityTracker class" 2010-05-13 11:39:51 -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
Jean-Baptiste Queru
ecfb185eed Merge "Preserve '+' in phone numbers imported from SIM." 2010-05-13 11:06:28 -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
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
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
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
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
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
fb6bd833ea am 7406eafe: should fix the build 2010-05-12 18:29:34 -07:00