Kenny Root
615f5d64db
Range checking for ResTable_map
...
Correct previous offset change and get ready for safe-iop.
Change-Id: Ib276c726f32b0711a72f47d3263eb21640e5a800
2010-06-08 12:51:49 -07:00
Kenny Root
db82a72f5e
Merge "Improve checking in aapt dump"
2010-06-08 10:29:17 -07:00
Kenny Root
61c22be593
Improve checking in aapt dump
...
The aapt dump reading had less error checking than the actual parsing,
so this change brings it more into parity so that bad APKs don't crash
"aapt dump"
Change-Id: Ib30e63e41be5c652645c4aa0de580a87b184529d
2010-06-08 10:28:19 -07:00
James Dong
87597604ac
am ef2ad683: am 31b19758: Merge "Second part of speeding up video recording frame rate" into kraken
2010-06-08 10:17:29 -07:00
Andreas Huber
a39d2fe886
am ae9348bc: am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
2010-06-08 10:15:34 -07:00
James Dong
b74b6463a2
am 31b19758: Merge "Second part of speeding up video recording frame rate" into kraken
2010-06-08 10:15:33 -07:00
Jim Miller
86f4f7a246
am cfa2d7c9: am 700a9506: am cb52cb52: Fix SDK build.
2010-06-08 10:15:27 -07:00
Jim Miller
c9d6dde707
am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
2010-06-08 10:15:21 -07:00
Christopher Tate
fd83c8d5e3
am 40c20b06: am 8a7fa44f: am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
2010-06-08 10:15:15 -07:00
Dianne Hackborn
0e2e35abf3
am fe2c0864: am 0bc0a46a: am d1d9047d: Merge "Fix issue #2749322 : addPackageToPreferred throws SecurityException" into froyo
2010-06-08 10:15:06 -07:00
James Dong
0e90861ce2
Merge "Second part of speeding up video recording frame rate" into kraken
2010-06-08 10:14:26 -07:00
Robert Greenwalt
33da63257e
Merge "resolved conflicts for merge of ee09dc67 to master"
2010-06-08 10:13:25 -07:00
Robert Greenwalt
43bba34d59
resolved conflicts for merge of ee09dc67 to master
...
Change-Id: I8b0b595580d9c6d44b84e636012705dc913fa6ac
2010-06-08 10:10:54 -07:00
Kenny Root
870b54f5c1
Merge "Include stdlib to fix sim build"
2010-06-08 09:34:39 -07:00
Andreas Huber
90af541554
am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
2010-06-08 09:20:59 -07:00
Andreas Huber
f0cf1d7ef8
Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
2010-06-08 09:19:07 -07:00
Ben Murdoch
cd85f9ae84
Merge "DumpRenderTree fix."
2010-06-08 02:46:21 -07:00
Jim Miller
944bf18fac
am 700a9506: am cb52cb52: Fix SDK build.
2010-06-07 21:25:15 -07:00
Jim Miller
ca436aa5b4
am cb52cb52: Fix SDK build.
...
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken
* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
Fix SDK build.
2010-06-07 21:23:53 -07:00
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
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
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
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
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
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
