ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,951 Commits 2 Branches 0 Tags 54 MiB
361fec2c72
Commit Graph

14951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
361fec2c72 am 105c58de: am 346c97c4: am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640 2010-04-13 16:24:42 -07:00
Amith Yamasani
bfe69ce650 am ecf917b6: am 61f280d5: am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo 2010-04-13 16:24:36 -07:00
Jean-Michel Trivi
a49c26e5ac am 824ca797: am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 16:24:29 -07:00
Gloria Wang
0a95706b64 am ce387505: am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available. 2010-04-13 16:24:23 -07:00
Daniel Sandler
c1144b5eef am cd3f349f: am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls. 2010-04-13 16:24:16 -07:00
Grace Kloba
e82b629d3d am 346c97c4: am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640 2010-04-13 16:05:34 -07:00
Amith Yamasani
f018568bff am 61f280d5: am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo 2010-04-13 16:05:27 -07:00
Jean-Michel Trivi
9bf31a9e98 am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 16:05:21 -07:00
Gloria Wang
3907504ed2 am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available. 2010-04-13 16:05:13 -07:00
Daniel Sandler
b86b59f685 am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls. 2010-04-13 16:05:07 -07:00
Grace Kloba
0a78255398 am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640 
Merge commit '58af51a1f2afc20ac1f1465b13c300754358be6c' into kraken

* commit '58af51a1f2afc20ac1f1465b13c300754358be6c':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
 2010-04-13 12:20:35 -07:00
Grace Kloba
6e5467d2b4 am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640 
Merge commit '763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp

* commit '763e62a831f6cf4e113bff868dab4d48560a3693':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
 2010-04-13 12:14:32 -07:00
Amith Yamasani
ef18fda571 am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo 
Merge commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken

* commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3':
  Fix an upgrade bug in SettingsProvider.
 2010-04-13 11:54:04 -07:00
Jean-Michel Trivi
6feb51a629 am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 
Merge commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7' into kraken

* commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7':
  Fix bug 2578813 Delay pausing music and routing audio for car docks
 2010-04-13 11:53:57 -07:00
Gloria Wang
914dc65219 am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available. 
Merge commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527' into kraken

* commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527':
  Fix for 2581725. Keep the last frame after resume(), and delete it
 2010-04-13 11:53:52 -07:00
Daniel Sandler
fca02d625f am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls. 
Merge commit 'de3601e05cf551e24eee50d4c1e70b5037792679' into kraken

* commit 'de3601e05cf551e24eee50d4c1e70b5037792679':
  Honor the "Never vibrate" setting for incoming calls.
 2010-04-13 11:53:30 -07:00
Daniel Sandler
fc991924c8 am ba7aa766: am 8dc634e8: am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo 2010-04-13 10:37:59 -07:00
Mathias Agopian
abf5e423eb am e73a100f: am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken 2010-04-13 10:37:55 -07:00
Daniel Sandler
c27dc23d13 am 8dc634e8: am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo 2010-04-13 10:33:11 -07:00
Mathias Agopian
87c1f50bcb am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken 2010-04-13 10:33:07 -07:00
Amith Yamasani
762e0ff7eb am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo 
Merge commit '842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp

* commit '842d983cc3158a3de77a897d071b5b9c18dd2b55':
  Fix an upgrade bug in SettingsProvider.
 2010-04-13 10:08:10 -07:00
Amith Yamasani
f05a8854ce Merge "Fix an upgrade bug in SettingsProvider." into froyo 2010-04-13 10:05:27 -07:00
Jean-Michel Trivi
54fddcb1e6 am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 
Merge commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp

* commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db':
  Fix bug 2578813 Delay pausing music and routing audio for car docks
 2010-04-13 09:54:47 -07:00
Gloria Wang
e2b7d4c5ad am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available. 
Merge commit 'b19da8e187db1cf223463809148b7cb2d9e9751a' into froyo-plus-aosp

* commit 'b19da8e187db1cf223463809148b7cb2d9e9751a':
  Fix for 2581725. Keep the last frame after resume(), and delete it
 2010-04-13 09:54:44 -07:00
Jean-Michel Trivi
35f3a77b07 Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 09:53:35 -07:00
Daniel Sandler
22c9c7cfc5 am bcac4960: Honor the "Never vibrate" setting for incoming calls. 
Merge commit 'bcac496076ef6f439147e7a2be71e8a2b76ddede' into froyo-plus-aosp

* commit 'bcac496076ef6f439147e7a2be71e8a2b76ddede':
  Honor the "Never vibrate" setting for incoming calls.
 2010-04-13 09:21:47 -07:00
Daniel Sandler
e8da53d2e9 am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo 
Merge commit 'b0cc22b4059ea49623defa1c118db9abdd59a0be' into kraken

* commit 'b0cc22b4059ea49623defa1c118db9abdd59a0be':
  Hide e-call button in layout.
 2010-04-13 06:10:10 -07:00
Daniel Sandler
0ed3d85b40 am 15683534: Merge "Hide e-call button in layout." into froyo 
Merge commit '15683534d1f1ca76a9a59ed921219db46ff5f800' into froyo-plus-aosp

* commit '15683534d1f1ca76a9a59ed921219db46ff5f800':
  Hide e-call button in layout.
 2010-04-13 06:05:20 -07:00
Daniel Sandler
5d89658b21 Merge "Hide e-call button in layout." into froyo 2010-04-13 06:00:02 -07:00
Mathias Agopian
296c9dc4fb Merge "don't hardcode "mSurface" throughout our source code" into kraken 2010-04-12 18:59:49 -07:00
Andreas Huber
8d3347ee59 am 63642b12: am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:28:48 -07:00
Andreas Huber
272240be3c am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:25:48 -07:00
Gilles Debunne
7bcbe8cf20 Merge "Added documentation in Drawable." 2010-04-12 17:22:14 -07:00
Andreas Huber
ae630622bf am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 
Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken

* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
  Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
 2010-04-12 17:21:33 -07:00
Andreas Huber
958a290a7c am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 
Merge commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp

* commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
  Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
 2010-04-12 17:18:43 -07:00
Andreas Huber
692dc8a970 Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:15:32 -07:00
android-build SharedAccount
c7bd32417d am e413fc11: manual merge 2010-04-12 17:01:36 -07:00
android-build SharedAccount
a54069e21f manual merge 
Change-Id: I4760b8fd2f4150441dbf15a598a6b44d9af27621
 2010-04-12 16:56:30 -07:00
Mathias Agopian
e4e8cf1f19 don't hardcode "mSurface" throughout our source code 
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.

Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
 2010-04-12 16:29:36 -07:00
Christopher Tate
b3815412f0 am 6a75d685: am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo 
Merge commit '6a75d6850c77fb48daba7700621856605ab60569' into kraken

* commit '6a75d6850c77fb48daba7700621856605ab60569':
  SDK: more backup/restore documentation work
 2010-04-12 16:23:35 -07:00
Christopher Tate
39cdc3ceb7 am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo 
Merge commit '7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp

* commit '7e8614a547eca78dd9178001f8f6c38444adf350':
  SDK: more backup/restore documentation work
 2010-04-12 16:18:16 -07:00
Scott Main
d6ec37dcb3 am 10bb4990: am 3f371793: Merge "docs: fix bug 2590728" into froyo 
Merge commit '10bb4990f3b13070e6cb7ec98761041679551338' into kraken

* commit '10bb4990f3b13070e6cb7ec98761041679551338':
  docs: fix bug 2590728
 2010-04-12 16:15:42 -07:00
Christopher Tate
f8654c9278 Merge "SDK: more backup/restore documentation work" into froyo 2010-04-12 16:14:53 -07:00
Scott Main
03960f16dd am 3f371793: Merge "docs: fix bug 2590728" into froyo 
Merge commit '3f371793287b6f10badc018fb9eaca33ac51a8e7' into froyo-plus-aosp

* commit '3f371793287b6f10badc018fb9eaca33ac51a8e7':
  docs: fix bug 2590728
 2010-04-12 16:12:24 -07:00
Scott Main
e8cfa791e3 Merge "docs: fix bug 2590728" into froyo 2010-04-12 16:09:28 -07:00
Jean-Baptiste Queru
e668eb3e5d am cd839752: manual merge 2010-04-12 15:38:08 -07:00
Gilles Debunne
223a2af0f0 Merge "Fixed links in MipmapDrawable documentation." 2010-04-12 15:36:59 -07:00
Jean-Baptiste Queru
41c04c89b0 manual merge 
Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774
 2010-04-12 15:32:13 -07:00
Christopher Tate
46ef879aeb am 7fef3c57: am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo 
Merge commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da' into kraken

* commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da':
  API CHANGE: remove obsolete constants and hide some methods
 2010-04-12 15:19:16 -07:00
Christopher Tate
7e017fd292 am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo 
Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp

* commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
  API CHANGE: remove obsolete constants and hide some methods
 2010-04-12 15:16:07 -07:00