Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,858 Commits 3 Branches 0 Tags
ebaa935e2dd534d46ae79091679e9c2d36710f81
Commit Graph

21858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
ebaa935e2d am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo 
Merge commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken

* commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
  Don't set encoder component role while we query decoders
 2010-04-13 12:20:38 -07:00
Grace Kloba
346c97c477 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
James Dong
9bb8e65a7d am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo 
Merge commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp

* commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
  Don't set encoder component role while we query decoders
 2010-04-13 12:15:26 -07:00
Grace Kloba
58af51a1f2 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
James Dong
c15f48d7d6 Merge "Don't set encoder component role while we query decoders" into froyo 2010-04-13 12:11:57 -07:00
Amith Yamasani
61f280d520 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
b843033566 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
465934d1e5 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
a32efedd26 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
Grace Kloba
763e62a831 Fix a case introduced by https://android-git.corp.google.com/g/#change,47640 
We skipped a call to WebKit at the end of the zoom
animation in the last CL.

Fix http://b/issue?id=2578820
 2010-04-13 11:35:10 -07:00
James Dong
722d591842 Don't set encoder component role while we query decoders 
bug - 2558515

Change-Id: I29683507d234d963994c782c07508034ea807739
 2010-04-13 10:58:41 -07:00
Amith Yamasani
feb976e6be 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
842d983cc3 Merge "Fix an upgrade bug in SettingsProvider." into froyo 2010-04-13 10:05:27 -07:00
Jean-Michel Trivi
34b2ecc82a 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
d4c072d3f5 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
c30890e102 Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 09:53:35 -07:00
Gloria Wang
b19da8e187 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.

Change-Id: I84286030eaae9061077d6ccb485b7dd53ef05341
 2010-04-13 09:46:40 -07:00
Jean-Michel Trivi
4c637b9e34 Fix bug 2578813 Delay pausing music and routing audio for car docks 
Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService
to AudioService.
Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP
device.
Disconnect from A2DP docks with a delay to handle transient
disconnections.
Cancel delayed A2DP disconnections when connecting to a dock as this
can be a reconnection after a transient disconnection.

Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
 2010-04-13 09:44:08 -07:00
Daniel Sandler
de3601e05c 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
bcac496076 Honor the "Never vibrate" setting for incoming calls. 
Bug: 2579295
Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8
 2010-04-13 12:18:44 -04:00
Daniel Sandler
8dc634e82f 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
b0cc22b405 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
15683534d1 Merge "Hide e-call button in layout." into froyo 2010-04-13 06:00:02 -07:00
Mathias Agopian
445a978554 Merge "don't hardcode "mSurface" throughout our source code" into kraken 2010-04-12 18:59:49 -07:00
Andreas Huber
7853c8988f 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
248ea4a9f7 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
5baa5e1917 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
Mathias Agopian
8b138323d5 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
5c7a69c3d6 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
6a75d6850c 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
9aa74f5942 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
7e8614a547 Merge "SDK: more backup/restore documentation work" into froyo 2010-04-12 16:14:53 -07:00
Scott Main
10bb4990f3 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
3f37179328 Merge "docs: fix bug 2590728" into froyo 2010-04-12 16:09:28 -07:00
Andreas Huber
d0332ad8d2 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. 
Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af
related-to-bug: 2587341
 2010-04-12 16:05:57 -07:00
Scott Main
ef4ca45340 docs: fix bug 2590728 
Change-Id: I997c4fd3b3fbe33f479c3fe15b8164370c0a18af
 2010-04-12 16:05:49 -07:00
Amith Yamasani
cd66caf015 Fix an upgrade bug in SettingsProvider. 
Bug: 2569112

Wrong usage of local method.

Change-Id: I9d7c68baa7cf8dd2b7e4345555c1edc374de94e6
 2010-04-12 15:49:12 -07:00
Christopher Tate
4e14a82912 SDK: more backup/restore documentation work 
Still not complete, but here's a lot more of the necessary documentation.
Submitting a checkpoint seems prudent.

Bug #2465360

Change-Id: Ifff60d57e4b24cee21f3a34f5f50e290d377c386
 2010-04-12 15:42:16 -07:00
Christopher Tate
c47f4be6c7 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
7fef3c57eb 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
Christopher Tate
b9e3e4ce7e Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo 2010-04-12 15:13:35 -07:00
Andreas Huber
fac0c29e5a am 98c5bd55: am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo 
Merge commit '98c5bd5556f32a237d3483fb7298284869e32a40' into kraken

* commit '98c5bd5556f32a237d3483fb7298284869e32a40':
  Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
 2010-04-12 14:23:31 -07:00
Andreas Huber
98c5bd5556 am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo 
Merge commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp

* commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361':
  Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
 2010-04-12 14:19:23 -07:00
Andreas Huber
6dbf80d086 Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo 2010-04-12 14:16:34 -07:00
Christopher Tate
fc922f1153 API CHANGE: remove obsolete constants and hide some methods 
This change removes some unused constants from BackupDataOutput
and hides a few methods that do not actually need to be exposed.

Change-Id: I47a9a107a5b58f4d53b5a2fcf9b73a765b1c5dd8
 2010-04-12 14:15:37 -07:00
Andreas Huber
ea1d6712fe Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice. 
Change-Id: I4e42e318fd5373d1f352f54027d4bf823126266d
related-to-bug: 2585276
 2010-04-12 13:15:48 -07:00
Kenny Root
a753fbe0f8 am 5b0fb521: am 290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo 
Merge commit '5b0fb521e6af1ca61141daa3d86f97fd6343f5e4' into kraken

* commit '5b0fb521e6af1ca61141daa3d86f97fd6343f5e4':
  Fix typos in name of density-independent pixels
 2010-04-12 12:24:51 -07:00
Kenny Root
5b0fb521e6 am 290a48b3: Merge "Fix typos in name of density-independent pixels" into froyo 
Merge commit '290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp

* commit '290a48b365479eccd16023b5de0d92063bb68b4d':
  Fix typos in name of density-independent pixels
 2010-04-12 12:20:50 -07:00
Kenny Root
290a48b365 Merge "Fix typos in name of density-independent pixels" into froyo 2010-04-12 12:19:08 -07:00
Jean-Michel Trivi
9448d6f4dd am 54419a4f: am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. 
Merge commit '54419a4fc908eab8408f39f3eae97c4315135d84' into kraken

* commit '54419a4fc908eab8408f39f3eae97c4315135d84':
  Fix monkey bug 2586534 java.util.ConcurrentModificationException
 2010-04-12 12:11:54 -07:00