Jim Miller
77a885523c
am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
2010-06-07 19:28:08 -07:00
Jim Miller
4c58e3ac69
am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
...
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp
* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
Fix 2737842: disable keyguard API when device policy is enabled.
2010-06-07 19:26:28 -07:00
Jim Miller
7d3eac2b0d
am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
...
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken
* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
Fix 2737842: disable keyguard API when device policy is enabled.
2010-06-07 19:25:49 -07:00
Jim Miller
c354b89c76
Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
2010-06-07 19:24:45 -07:00
Christopher Tate
7b2f655acb
am 8a7fa44f: am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
2010-06-07 18:50:44 -07:00
Christopher Tate
f023c4ce5b
am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
...
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp
* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete
2010-06-07 18:49:07 -07:00
Christopher Tate
ba34889611
am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
...
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into kraken
* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete
2010-06-07 18:48:27 -07:00
Christopher Tate
e1855846a4
Merge "Don't bring up Launcher until after boot complete" into froyo
2010-06-07 18:46:46 -07:00
Dianne Hackborn
dbfef2a428
am 0bc0a46a: am d1d9047d: Merge "Fix issue #2749322 : addPackageToPreferred throws SecurityException" into froyo
2010-06-07 18:34:10 -07:00
Dianne Hackborn
2484ce43dd
am d1d9047d: Merge "Fix issue #2749322 : addPackageToPreferred throws SecurityException" into froyo
...
Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into froyo-plus-aosp
* commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
Fix issue #2749322 : addPackageToPreferred throws SecurityException
2010-06-07 18:32:41 -07:00
Dianne Hackborn
dd4650da60
am d1d9047d: Merge "Fix issue #2749322 : addPackageToPreferred throws SecurityException" into froyo
...
Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into kraken
* commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
Fix issue #2749322 : addPackageToPreferred throws SecurityException
2010-06-07 18:32:04 -07:00
Dianne Hackborn
73f8edb0d6
Merge "Fix issue #2749322 : addPackageToPreferred throws SecurityException" into froyo
2010-06-07 17:32:02 -07:00
Robert Greenwalt
b245ecda7a
am 7db534fa: am 5a671d03: Cut logging, boost efficiency of ThrottleService
2010-06-07 17:00:41 -07:00
Robert Greenwalt
c2d073a78e
am 5a671d03: Cut logging, boost efficiency of ThrottleService
...
Merge commit '5a671d03e3abe522a761a43b0460f9f3816b14ed' into froyo-plus-aosp
* commit '5a671d03e3abe522a761a43b0460f9f3816b14ed':
Cut logging, boost efficiency of ThrottleService
2010-06-07 16:59:23 -07:00
Robert Greenwalt
1229aeb5da
am 5a671d03: Cut logging, boost efficiency of ThrottleService
...
Merge commit '5a671d03e3abe522a761a43b0460f9f3816b14ed' into kraken
* commit '5a671d03e3abe522a761a43b0460f9f3816b14ed':
Cut logging, boost efficiency of ThrottleService
2010-06-07 16:59:01 -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
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
Jean-Baptiste Queru
a0abbe38b9
Merge "Canvas.drawVertices: correct color range-check"
2010-06-07 14:51:42 -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
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
Andreas Huber
752a4bc77d
am a557b24a: Initial checkin of mpeg2 transport stream parser for stagefright.
2010-06-07 13:19:55 -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
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
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
Mathias Agopian
9888e3ebfd
am fae5cb2b: optimize Surface.readFromParcel()
2010-06-04 19:15:46 -07:00
Mathias Agopian
c7a4570cd7
am 7623da43: split surface management from surface\'s buffers management
2010-06-04 19:15:42 -07:00
Mathias Agopian
4e24a5671b
am 593c05ce: clean-up client management.
2010-06-04 19:15:38 -07:00
Mathias Agopian
a0c30e9241
optimize Surface.readFromParcel()
...
this is called for each relayout() and used to create a full Surface (cpp)
which in turn did some heavy work (including an IPC with surfaceflinger),
most of the time to destroy it immediatelly when the returned surface
(the one in the parcel) was the same.
we now more intelligentely read from the parcel and construct the new
object only if needed.
Change-Id: Idfd40d9ac96ffc6d4ae5fd99bcc0773e131e2267
2010-06-04 18:57:41 -07:00
Mathias Agopian
b7e930db17
split surface management from surface's buffers management
...
Change-Id: If3c5655d1231f8f0c49ba68f972b1b20c93b3f87
2010-06-04 18:57:41 -07:00
Mathias Agopian
96f0819f81
clean-up client management.
...
simplified things a lot, the biggest change is that the concept
of "ClientID" is now gone, instead we simply use references.
Change-Id: Icbc57f80865884aa5f35ad0d0a0db26f19f9f7ce
2010-06-04 18:57:40 -07:00
Christopher Tate
076c8394fa
am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
...
Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into froyo-plus-aosp
* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
Watchdog now records kernel stacks when it fires
2010-06-04 18:07:07 -07:00
Christopher Tate
7188d6887e
Merge "Watchdog now records kernel stacks when it fires" into froyo
2010-06-04 18:06:07 -07:00
Dianne Hackborn
f896be96c9
am 5474902f: Merge "xhdpi" into froyo
...
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into froyo-plus-aosp
* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
xhdpi
2010-06-04 16:33:48 -07:00