The Android Open Source Project
c75e10a738
am cefdedc3: merge from froyo-plus-aosp
2010-06-07 16:45:04 -07:00
The Android Open Source Project
d0e428b8a2
merge from froyo-plus-aosp
...
Change-Id: I58f1d905b3fa781e4f5827d4d7b9323a4cdcc04e
2010-06-07 16:42:09 -07:00
The Android Open Source Project
33f7b83776
merge from open-source master
...
Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
2010-06-07 16:37:22 -07:00
The Android Open Source Project
e475488b11
merge from open-source master
...
Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
2010-06-07 16:32:53 -07:00
Andreas Huber
80fcb23f64
am 6fa5360e: am 2cbff0ed: Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken
2010-06-07 15:24:16 -07:00
Andreas Huber
6a9e2e94e4
am 2cbff0ed: Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken
2010-06-07 15:21:59 -07:00
Andreas Huber
6dd842e948
Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken
2010-06-07 15:20:14 -07:00
Adam Powell
c6806fad40
Merge "Fix bug 2747634 - Crash on selecting wifi"
2010-06-07 15:13:47 -07:00
Dan Egnor
0eca0b1118
Merge "Add support for logging curl commands for binary POST data"
2010-06-07 14:53:00 -07:00
Jean-Baptiste Queru
a0abbe38b9
Merge "Canvas.drawVertices: correct color range-check"
2010-06-07 14:51:42 -07:00
Brett Chabot
f5e2e0178e
Merge "2744878 com.android.server.AccessibilityManagerServiceTest:testInterrupt is failing"
2010-06-07 14:40:47 -07:00
Jaikumar Ganesh
b6fb3233b6
am a182e12b: am 526f2ff1: Merge "Serialize all commands for a particular profile." into kraken
2010-06-07 14:13:24 -07:00
Jaikumar Ganesh
77930baafa
am 8984d144: am a8c2514e: Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken
2010-06-07 14:13:19 -07:00
Jaikumar Ganesh
4a374f519b
am eee1376c: am e50ab5f9: Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken
2010-06-07 14:13:14 -07:00
Jaikumar Ganesh
a524f1b570
am 526f2ff1: Merge "Serialize all commands for a particular profile." into kraken
2010-06-07 14:11:28 -07:00
Jaikumar Ganesh
86823e8d20
am a8c2514e: Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken
2010-06-07 14:11:24 -07:00
Jaikumar Ganesh
a1877f72ab
am e50ab5f9: Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken
2010-06-07 14:11:20 -07:00
Jaikumar Ganesh
3906444c24
Merge "Serialize all commands for a particular profile." into kraken
2010-06-07 14:10:08 -07:00
Jaikumar Ganesh
cac9c9442c
Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken
2010-06-07 14:09:49 -07:00
Jaikumar Ganesh
7cf8084382
Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken
2010-06-07 14:09:39 -07:00
David 'Digit' Turner
ac5c80cc2d
am 3f0ed2a5: am e0cbd72b: Merge "PackageManagerService: always install native binaries from .apk" into kraken
2010-06-07 14:06:14 -07:00
David 'Digit' Turner
0366fc387e
am e0cbd72b: Merge "PackageManagerService: always install native binaries from .apk" into kraken
2010-06-07 14:04:20 -07:00
David 'Digit' Turner
b36fd44190
Merge "PackageManagerService: always install native binaries from .apk" into kraken
2010-06-07 14:02:38 -07:00
Dmitri Plotnikov
559e61baed
Merge "Contact directory (GAL) API proposal."
2010-06-07 14:01:31 -07:00
Andreas Huber
e8f216dde0
am f7d1c542: am a557b24a: Initial checkin of mpeg2 transport stream parser for stagefright.
2010-06-07 13:21:56 -07:00
Andreas Huber
752a4bc77d
am a557b24a: Initial checkin of mpeg2 transport stream parser for stagefright.
2010-06-07 13:19:55 -07:00
Andreas Huber
ba0ebc9ae7
am cd4961d9: am 455d4100: Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
2010-06-07 12:54:21 -07:00
Dianne Hackborn
7fc58fde68
am 7d75a66c: am b7bb3b3d: Fix bug in reporting a processes\'s dependent component.
2010-06-07 12:54:04 -07:00
Andreas Huber
6f06fd2576
am 455d4100: Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
2010-06-07 12:51:16 -07:00
Dianne Hackborn
72e11b9c88
am b7bb3b3d: Fix bug in reporting a processes\'s dependent component.
2010-06-07 12:51:10 -07:00
Andreas Huber
d17db3259b
Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
2010-06-07 12:50:05 -07:00
Makoto Onuki
5b0e47b12b
Merge "Fix UnsupportedOperationException from MockContext."
2010-06-07 10:51:31 -07:00
Evan Charlton
a753ebd9cb
Merge "Invalidate the ProgressBar when changing animation states"
2010-06-07 10:49:13 -07:00
James Dong
4195dc69f1
am f520c763: am 7a68d368: Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken
2010-06-07 10:22:38 -07:00
James Dong
55a246736a
am 7a68d368: Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken
2010-06-07 10:21:10 -07:00
James Dong
f7618b4caf
Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken
2010-06-07 10:19:58 -07:00
Christopher Tate
c994f33309
am 8207e2fd: am a8ebe8b3: am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
2010-06-06 12:14:03 -07:00
Dianne Hackborn
8ad7b70cd7
am fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyo
2010-06-06 12:13:59 -07:00
Robert Greenwalt
6fc2b826d3
am 1bdb78c1: am 9c4ed139: am f9610b38: Merge "Make the DUN apn data secure." into froyo
2010-06-06 12:13:55 -07:00
Christopher Tate
d6968bbbb0
am a8ebe8b3: am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
2010-06-06 12:11:54 -07:00
Dianne Hackborn
b3ee1685bc
am 168585ed: am 5474902f: Merge "xhdpi" into froyo
2010-06-06 12:11:50 -07:00
Robert Greenwalt
315754c1fc
am 9c4ed139: am f9610b38: Merge "Make the DUN apn data secure." into froyo
2010-06-06 12:11:45 -07:00
Christopher Tate
72ff18995b
am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
...
Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into kraken
* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
Watchdog now records kernel stacks when it fires
2010-06-06 12:10:08 -07:00
Dianne Hackborn
0bb514915b
am 5474902f: Merge "xhdpi" into froyo
...
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken
* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
xhdpi
2010-06-06 12:10:05 -07:00
Robert Greenwalt
94792dbc32
am f9610b38: Merge "Make the DUN apn data secure." into froyo
...
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken
* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
2010-06-06 12:10:00 -07:00
Grace Kloba
7d13a28bd1
Merge "Do not call AlertDialog.show() if the context is not the focused Activity. In that case, just take the default cancel."
2010-06-04 21:36:45 -07:00
Roman Nurik
f840ebc2fb
Merge "Revamp resources listing, part 1 (frameworks/base)"
2010-06-04 20:20:10 -07:00
Mathias Agopian
fcd61524e8
am f5f7d389: am fae5cb2b: optimize Surface.readFromParcel()
2010-06-04 19:17:16 -07:00
Mathias Agopian
e78d81eddd
am fd89b1c8: am 7623da43: split surface management from surface\'s buffers management
2010-06-04 19:17:12 -07:00
Mathias Agopian
a0b3ad88db
am cfa6de70: am 593c05ce: clean-up client management.
2010-06-04 19:17:08 -07:00
