Romain Guy
649329c3da
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
2010-06-08 12:59:36 -07:00
Brad Fitzpatrick
03540cdc9d
Merge "Log.wtf when databases go to be downgraded." into kraken
2010-06-08 12:37:34 -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
Andreas Huber
f0cf1d7ef8
Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
2010-06-08 09:19:07 -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
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
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
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
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
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
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
b36fd44190
Merge "PackageManagerService: always install native binaries from .apk" into kraken
2010-06-07 14:02:38 -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
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
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
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
7188d6887e
Merge "Watchdog now records kernel stacks when it fires" into froyo
2010-06-04 18:06:07 -07:00
Dianne Hackborn
28b9f6e900
Merge "xhdpi" into froyo
2010-06-04 16:32:01 -07:00
Robert Greenwalt
0f3ca0faea
Merge "Make the DUN apn data secure." into froyo
2010-06-04 15:55:09 -07:00
Jeff Hamilton
a81aea7eca
am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.
...
Merge commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac' into kraken
* commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac':
Don't crash when low storage is encountered pre-boot completion.
2010-06-04 13:52:45 -07:00
Jeff Hamilton
e0f5def3fd
am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.
...
Merge commit '4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp
* commit '4b3309211ed6f3532b44481945a4725143d50b8a':
Don't crash when low storage is encountered pre-boot completion.
2010-06-04 13:50:31 -07:00
Dianne Hackborn
c346eca2a9
Merge "Add support for heavy-weight applications." into kraken
2010-06-04 13:30:32 -07:00
The Android Open Source Project
6cd6b7bb08
am 2d743fe2: merge from open-source master
...
Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken
* commit '2d743fe2f39397d41334001d897eb78da56e94ef':
Add better error handling for savePicture and restorePicture
2010-06-04 12:58:09 -07:00
The Android Open Source Project
dc544d2168
merge from open-source master
...
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
2010-06-04 11:08:36 -07:00
Jaikumar Ganesh
86b728906f
Merge "Delete local references to avoid reference table overflow." into kraken
2010-06-04 09:46:03 -07:00
Wu-cheng Li
a23707b1c2
Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken
2010-06-04 03:38:25 -07:00
Eric Laurent
b5ac790af2
Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
2010-06-04 00:14:46 -07:00
Wu-cheng Li
43189960f9
Merge "Add camera metering mode API." into kraken
2010-06-03 22:32:05 -07:00
Brad Fitzpatrick
999cc236f9
Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken
2010-06-03 16:07:51 -07:00
Andreas Huber
f2322f1623
am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
...
Merge commit 'e896d41699ffe7be932102d7ccc9566f41ddb447' into kraken
* commit 'e896d41699ffe7be932102d7ccc9566f41ddb447':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
2010-06-03 15:31:56 -07:00
Andreas Huber
dc9c0cb435
am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
...
Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp
* commit '2e3761ba43f634e97ac493f4b79e5e53954a1491':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
2010-06-03 15:30:03 -07:00
Andreas Huber
da26806e79
Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
2010-06-03 15:28:13 -07:00
Romain Guy
ec39747a76
Merge "Add better error handling for savePicture and restorePicture"
2010-06-03 14:26:21 -07:00
Dirk Dougherty
7dba3e583b
am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
...
Merge commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c' into kraken
* commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c':
Doc change: Adjust security sandbox description.
2010-06-03 13:00:31 -07:00
Dirk Dougherty
daca1ada02
am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
...
Merge commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp
* commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
Doc change: Adjust security sandbox description.
2010-06-03 12:58:35 -07:00
Dirk Dougherty
c253940208
Merge "Doc change: Adjust security sandbox description." into froyo
2010-06-03 12:57:06 -07:00
James Dong
37d5dbc742
am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
...
Merge commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken
* commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:30:03 -07:00
James Dong
1ce3ee8a00
am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
...
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp
* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:27:19 -07:00
James Dong
c1cf2705d5
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
2010-06-03 11:26:09 -07:00
The Android Open Source Project
2519d6ce45
am ee7e6a78: merge from open-source master
...
Merge commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken
* commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401':
Improved error-handling in Rfc822Tokenizer
2010-06-03 09:09:07 -07:00
The Android Open Source Project
1531d2f979
merge from open-source master
...
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
2010-06-03 09:03:58 -07:00