OSDN Git Service
Marco Nelissen [Mon, 13 Feb 2012 23:47:58 +0000 (15:47 -0800)]
Merge "Further optimize media scanner."
Makoto Onuki [Mon, 13 Feb 2012 23:20:40 +0000 (15:20 -0800)]
Merge "Fix the 3-parameter formatNumber to correctly handle IDDs."
Jeff Brown [Mon, 13 Feb 2012 23:04:33 +0000 (15:04 -0800)]
Merge "Don't serialize motion events."
Fabrice Di Meglio [Mon, 13 Feb 2012 22:58:53 +0000 (14:58 -0800)]
Merge "Update BiDiTest app for GridLayout RTL tests"
Tsu Chiang Chuang [Mon, 13 Feb 2012 22:42:42 +0000 (14:42 -0800)]
am
8885596a: am
3ded587c: am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
8885596a9109794ebd61e6a91e5199aa1750ed8c':
Dianne Hackborn [Mon, 13 Feb 2012 22:42:40 +0000 (14:42 -0800)]
am
84affb8a: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
84affb8ae6477c46c75f834b73daa13b2a751c21':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Tsu Chiang Chuang [Mon, 13 Feb 2012 22:39:48 +0000 (14:39 -0800)]
am
3ded587c: am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
3ded587cc199d4ba592e675dc47fb80a28d1dacd':
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Dianne Hackborn [Mon, 13 Feb 2012 22:34:26 +0000 (14:34 -0800)]
Merge "Move BroadcastQueue out of the ActivityManager class."
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:27:40 +0000 (14:27 -0800)]
am
352b8d03: (-s ours) am
8046e294: Merge "DO NOT MERGE" into ics-scoop
* commit '
352b8d03c63585f4eaec09d2e39a4d173be83164':
DO NOT MERGE
Eric Fischer [Mon, 13 Feb 2012 22:26:03 +0000 (14:26 -0800)]
Merge "Import translations."
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)]
am
8046e294: Merge "DO NOT MERGE" into ics-scoop
* commit '
8046e294c545b8e3712bff7925b024639936d5bf':
DO NOT MERGE
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:22:44 +0000 (14:22 -0800)]
Merge "DO NOT MERGE" into ics-scoop
Jean-Michel Trivi [Mon, 13 Feb 2012 22:21:36 +0000 (14:21 -0800)]
Merge "Playback rate on MediaPlayer"
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Jeff Brown [Mon, 13 Feb 2012 22:02:51 +0000 (14:02 -0800)]
Merge "Accurately track the sequence numbers of batched events."
Fabrice Di Meglio [Mon, 13 Feb 2012 22:01:28 +0000 (14:01 -0800)]
Merge "Fix bug #
5904777 GridLayout should be RTL aware"
Jeff Brown [Mon, 13 Feb 2012 21:18:09 +0000 (13:18 -0800)]
Accurately track the sequence numbers of batched events.
Instead of sending finished signals immediately when appending to
a batch, record the chain of sequence numbers that were part of
the batch and then send finished signals all at once when done.
This change helps the dispatcher keep track of the true state
of the application and can improve ANR detection slightly.
This is part of a series of changes to improve input system pipelining.
Bug:
5963420
Change-Id: I463c2221e2aa8fdf1c3d670c18e39e59ab69b0db
Jeff Brown [Mon, 13 Feb 2012 21:55:41 +0000 (13:55 -0800)]
Merge "Enable deferred input messages to be batched."
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:47:45 +0000 (13:47 -0800)]
am
5f5ea91f: am
eb56ad18: am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
5f5ea91f60b4b7d2fcf3da3603cd745a53cba48f':
extending timeout to stabilize tests
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:45:06 +0000 (13:45 -0800)]
am
eb56ad18: am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
eb56ad183af8a9833ff22a22b97f174f05266c58':
extending timeout to stabilize tests
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:43:07 +0000 (13:43 -0800)]
am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
extending timeout to stabilize tests
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:42:45 +0000 (13:42 -0800)]
am
08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '
08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
extending timeout to stabilize tests
Tsu Chiang Chuang [Mon, 13 Feb 2012 21:41:37 +0000 (13:41 -0800)]
Merge "extending timeout to stabilize tests" into ics-mr1
Dianne Hackborn [Mon, 13 Feb 2012 21:30:53 +0000 (13:30 -0800)]
Merge "Fix issue where screen rotations would stop animating."
Jeff Brown [Mon, 13 Feb 2012 20:44:01 +0000 (12:44 -0800)]
Enable deferred input messages to be batched.
This is part of a series of changes to improve input system pipelining.
Bug:
5963420
Change-Id: I6874d2128e880a35c6c33890c858cc6ee22af0fd
Dianne Hackborn [Mon, 13 Feb 2012 20:41:27 +0000 (12:41 -0800)]
am
d1f88de2: am
c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
d1f88de2c496423e483760654a4381b563dc1e1d':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Mon, 13 Feb 2012 20:38:37 +0000 (12:38 -0800)]
am
c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Eric Laurent [Mon, 13 Feb 2012 20:27:27 +0000 (12:27 -0800)]
Merge "Fix audio preprocessing library wrapper"
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Stephen Hines [Mon, 13 Feb 2012 19:13:21 +0000 (11:13 -0800)]
Merge "Test initialization of constant array exports."
Glenn Kasten [Mon, 13 Feb 2012 18:31:44 +0000 (10:31 -0800)]
Merge "Factor out and speed up permission-checking code"
Jeff Brown [Tue, 7 Feb 2012 22:46:57 +0000 (14:46 -0800)]
Implement batching of input events on the consumer side.
To support this feature, the input dispatcher now allows input
events to be acknowledged out-of-order. As a result, the
consumer can choose to defer handling an input event from one
device (because it is building a big batch) while continuing
to handle input events from other devices.
The InputEventReceiver now sends a notification when a batch
is pending. The ViewRoot handles this notification by scheduling
a draw on the next sync. When the draw happens, the InputEventReceiver
is instructed to consume all pending batched input events, the
input event queue is fully processed (as much as possible),
and then the ViewRoot performs traversals as usual.
With these changes in place, the input dispatch latency is
consistently less than one frame as long as the application itself
isn't stalled. Input events are delivered to the application
as soon as possible and are handled as soon as possible. In practice,
it is no longer possible for an application to build up a huge
backlog of touch events.
This is part of a series of changes to improve input system pipelining.
Bug:
5963420
Change-Id: I42c01117eca78f12d66d49a736c1c122346ccd1d
Jeff Brown [Tue, 7 Feb 2012 03:12:47 +0000 (19:12 -0800)]
Dispatch multiple touch events in parallel.
This change enables the input dispatcher to send multiple touch
events to an application without waiting for them to be acknowledged.
Essentially this is a variation on the old streaming optimization
but it is much more comprehensive. Event dispatch will stall as
soon as 0.5sec of unacknowledged events are accumulated or a
focused event (such as a key event) needs to be delivered.
Streaming input events makes a tremendous difference in application
performance. The next step will be to enable batching of input
events on the client side once again.
This is part of a series of changes to improve input system pipelining.
Bug:
5963420
Change-Id: I025df90c06165d719fcca7f63eed322a5cce4a78
Jeff Brown [Sat, 4 Feb 2012 04:11:27 +0000 (20:11 -0800)]
Rewrite input transport using sockets.
Since we will not longer be modifying events in place, we don't need
to use an ashmem region for input. Simplified the code to instead
use a socket of type SOCK_SEQPACKET.
This is part of a series of changes to improve input system pipelining.
Bug:
5963420
Change-Id: I05909075ed8b61b93900913e44c6db84857340d8
Jeff Brown [Mon, 13 Feb 2012 18:26:40 +0000 (10:26 -0800)]
Merge "Process input events immediately when received."
Jeff Brown [Mon, 13 Feb 2012 18:26:33 +0000 (10:26 -0800)]
Merge "Remove the input dispatcher throttle."
Marc Blank [Mon, 13 Feb 2012 18:20:38 +0000 (10:20 -0800)]
Merge "Use ' for apostrophe in HTML encoding"
Mike Lockwood [Sat, 11 Feb 2012 05:55:52 +0000 (21:55 -0800)]
Merge "Add support for non-linear ramping of master volume adjustment"
James Dong [Sat, 11 Feb 2012 01:57:16 +0000 (17:57 -0800)]
Merge "Change the signature of method addTextSource() in AwesomePlayer"
Wink Saville [Sat, 11 Feb 2012 01:00:51 +0000 (17:00 -0800)]
am
5caed1d9: am
f11b6fbf: am
197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '
5caed1d99b99a011501c532fbf970324ea82e13d':
Wink Saville [Sat, 11 Feb 2012 00:57:39 +0000 (16:57 -0800)]
Merge "resolved conflicts for merge of
e8b57fea to master"
Wink Saville [Sat, 11 Feb 2012 00:11:18 +0000 (16:11 -0800)]
resolved conflicts for merge of
e8b57fea to master
Change-Id: I2ccf2b4cb73faadd0c8608cc21dda5db888d2937
Glenn Kasten [Fri, 10 Feb 2012 23:32:16 +0000 (15:32 -0800)]
Merge "Simplify ThreadBase::exit() aka requestExitAndWait"
Glenn Kasten [Fri, 10 Feb 2012 23:31:54 +0000 (15:31 -0800)]
Merge "Disable HQ resamplers for now until qualified"
Glenn Kasten [Fri, 10 Feb 2012 23:31:07 +0000 (15:31 -0800)]
Merge "Move header declarations around for clarity"
Glenn Kasten [Fri, 10 Feb 2012 23:30:15 +0000 (15:30 -0800)]
Merge "Camel case readability & private disconnect(bool)"
Glenn Kasten [Fri, 10 Feb 2012 23:29:35 +0000 (15:29 -0800)]
Merge "Remove aliasing"
Glenn Kasten [Fri, 10 Feb 2012 23:28:57 +0000 (15:28 -0800)]
Merge "Use mul from audioutils"
Wink Saville [Fri, 10 Feb 2012 23:28:54 +0000 (15:28 -0800)]
am
f11b6fbf: am
197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '
f11b6fbfc8bab9a09e37ef9866c0da247474f4cf':
Glenn Kasten [Fri, 10 Feb 2012 23:28:45 +0000 (15:28 -0800)]
Merge "Mark fields const if only set in constructor"
Mike Lockwood [Fri, 10 Feb 2012 23:26:36 +0000 (15:26 -0800)]
Merge changes Iefeba018,I1ce5b26d,Ie3f59793,Id3c5e1ec,I9063154a,Ib7bd88a3,I20963df8,I01060b08,I7dc29739,I5c55a051,Ia07aa3c4,I3194ea94,I0dc37cce,Ic3a7bb65,I0a7eaecf,Ifa7b0614,Ice952c8e,Ia5abdb9e,Ifcb310f9,If5f4ec97,I4767690f,I79824179,I6e0f981e,Id60ae7f6
* changes:
EthernetDataTracker: Don't run DHCP or set network available until link is up
Only send master volume or mute updates if the settings have changed
Make AudioManager.adjustMasterVolume public and hidden
Allow disabling network stats support in a resource overlay
Restore persisted master volume if the media server restarts
Don't allow changing master volume when muted
Show the flags in package manager debugging.
Modified the constructor of EndpointBase
Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes
Defer persisting master data to avoid excessive database writes
Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
Remove reference counting and client death notification for master mute
AudioService: Send broadcasts when master volume and mute state change
Use the new get/putFlattenable methods on RpcData.
Don't try to unmarshal void return types when there are out parameters being returned.
AudioManager: Add wrapper methods for master volume support
AudioManager: Add support for master mute
NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
For events, require that the parameters be marked in.
PhoneWindowManager: stifle warning that ITelephony service does not exist
AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.
Support putting Flattenables in Lists.
Was generating code that uses the wrong RpcData.
store the hw addr in the extraInfo field of ethernet NetworkInfos
Wink Saville [Fri, 10 Feb 2012 23:17:12 +0000 (15:17 -0800)]
am
812c2ff6: am
197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '
812c2ff6312b25b9539399f38967f8a6ff40b733':
Add OEM specific USB mode enumeration based on ro.bootmode property
Wink Saville [Fri, 10 Feb 2012 23:14:40 +0000 (15:14 -0800)]
am
197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '
197fe26940022be75384f4038dd789f446d33122':
Add OEM specific USB mode enumeration based on ro.bootmode property
Wink Saville [Fri, 10 Feb 2012 23:14:40 +0000 (15:14 -0800)]
am
197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '
197fe26940022be75384f4038dd789f446d33122':
Add OEM specific USB mode enumeration based on ro.bootmode property
Svetoslav Ganov [Fri, 10 Feb 2012 23:13:26 +0000 (15:13 -0800)]
Merge "UI automation service disconnected upon package change."
Wink Saville [Fri, 10 Feb 2012 23:12:19 +0000 (15:12 -0800)]
Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
Alex Sakhartchouk [Fri, 10 Feb 2012 23:00:21 +0000 (15:00 -0800)]
Merge "Making shader compilation errors throw a Java exception."
Amith Yamasani [Fri, 10 Feb 2012 22:34:52 +0000 (14:34 -0800)]
Merge "Multi-user - wallpaper service"
James Dong [Fri, 10 Feb 2012 22:17:06 +0000 (14:17 -0800)]
Merge "Move away from MediaDebug and use ADebug instead"
Jason Sams [Fri, 10 Feb 2012 21:51:04 +0000 (13:51 -0800)]
Merge "Start implementing SurfaceTexture streaming into RS allocations."
Glenn Kasten [Fri, 10 Feb 2012 21:36:24 +0000 (13:36 -0800)]
Merge "No newline or space at end of ALOG format string"
Glenn Kasten [Fri, 10 Feb 2012 21:33:31 +0000 (13:33 -0800)]
Merge "Move declaration of stream_type_t up earlier"
Glenn Kasten [Fri, 10 Feb 2012 21:33:02 +0000 (13:33 -0800)]
Merge "Fix typos in ALOG for pid vs tid"
Glenn Kasten [Fri, 10 Feb 2012 21:30:24 +0000 (13:30 -0800)]
Merge "Rename type() to streamType()"
Eric Fischer [Fri, 10 Feb 2012 21:15:26 +0000 (13:15 -0800)]
am
5b6f9bf5: (-s ours) am
8b6d7b06: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
5b6f9bf51c13532acac782a23506cb0b783b8876':
Eric Fischer [Fri, 10 Feb 2012 21:15:23 +0000 (13:15 -0800)]
am
ffb2473b: (-s ours) am
a2c92418: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
ffb2473b3bd8a4986e41ff0a711e708656432eaf':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:13:58 +0000 (13:13 -0800)]
am
8b6d7b06: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
8b6d7b063b5a94b59b4a1132763f4644ee1d8545':
Eric Fischer [Fri, 10 Feb 2012 21:13:30 +0000 (13:13 -0800)]
am
a2c92418: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
a2c9241869c14a058621668d65ca29fc8a867bbf':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:46 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:45 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Fri, 10 Feb 2012 21:07:54 +0000 (13:07 -0800)]
Merge "Clean up and expose LongSparseArray."
Mike Lockwood [Fri, 10 Feb 2012 21:05:13 +0000 (13:05 -0800)]
Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce
* changes:
Make ActivityManagerService just kill apps when they crash on headless devices.
Add support for disabling wallpaper service
Fix merge problem
Add the ability to pass float extras to AM.
Adding a feature to indicate specific support for Bluetooth API.
SystemServer: Add support for disabling AudioService and MountService
Mike Lockwood [Fri, 10 Feb 2012 21:03:24 +0000 (13:03 -0800)]
Merge "BatteryService: Don't fail to register native methods if kernel power supply driver is missing"
Eric Fischer [Fri, 10 Feb 2012 20:54:21 +0000 (12:54 -0800)]
Merge "Import translations."
Mike Lockwood [Fri, 10 Feb 2012 19:50:10 +0000 (11:50 -0800)]
Merge changes Id747dc81,I3a74bd36,I2395527c,I86aeb066,Ic33d5766,I7bef7390,I4b797dd8,Id3622e9e,I28087c63,Ia1c6d909,I95a766dd,I6c0236c5,Ib71287f4,I4bcbefdc,I22a7cb8d,Ie24dbeaf,I7dbc4b45,I21d524ea,Iaa5bf14e,I7db766c3,I93fcaca2,I1eb72044,I05ffbe7c,Ifdfe2ff8,Ia8f767a2
* changes:
Fix problems dispatching media button events on headless devices
Add headless mode for running the framework without the surface flinger
SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
Load lockscreen.disabled setting on database create as well as upgrade
SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI
SettingsProvider: Add support for overriding lockscreen.disabled default value
Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
Disable output processing when opening serial port.
Update aidl for new Broker API.
aidl: All flattenable types now must also be parcelable.
Update aidl to new APIs.
Suport RpcData as a parcelable type.
Modified AIDL to support authentication
Fix disconnect from wired ethernet issues.
Fix PresenterClass by adding a _listener field
add presenters to aidl.
Add SerialPort.sendBreak()
Generate fallthrough for unhandled actions in RPC methods.
PhoneWindowManager: Disable boot progress dialog on headless builds
Support custom flattenable types for RPC.
SystemServer: Don't start A2DP service if audio is not enabled
Add RpcData as a built-in marshallable type.
Add the full suite of RpcData types.
Checkpoint adding @home RPC support to aidl
ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless
Mike Lockwood [Fri, 10 Feb 2012 19:41:56 +0000 (11:41 -0800)]
Merge "Quick and dirty test app for new SerialPort API"
Mike Lockwood [Fri, 10 Feb 2012 19:41:41 +0000 (11:41 -0800)]
Merge "New Serial Manager API:"
Dianne Hackborn [Fri, 10 Feb 2012 19:14:39 +0000 (11:14 -0800)]
Merge "Some cruft removal."
Justin Ho [Fri, 10 Feb 2012 18:51:52 +0000 (10:51 -0800)]
am
25d1d268: (-s ours) am
0fc225ed: am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
25d1d268c1b00734f4bdd7fcb85ced97645a7f29':
Justin Ho [Fri, 10 Feb 2012 18:49:48 +0000 (10:49 -0800)]
am
0fc225ed: am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
0fc225ed37ec535ff9b5238f390a79dbaf7f377b':
Justin Ho [Fri, 10 Feb 2012 18:19:58 +0000 (10:19 -0800)]
am
f994f353: (-s ours) am
448249d1: (-s ours) am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
f994f353f705dc69c1e57bd6785092218fd630d2':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:13:19 +0000 (10:13 -0800)]
am
448249d1: (-s ours) am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
448249d1a7e0b871b9a9db49a45e0e51f6d36d65':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:10:39 +0000 (10:10 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:09:42 +0000 (10:09 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
Marco Nelissen [Fri, 10 Feb 2012 15:13:23 +0000 (07:13 -0800)]
Merge "Fix "dumpsys activity provider""
satok [Fri, 10 Feb 2012 10:22:57 +0000 (02:22 -0800)]
Merge "Add an api to switch to the next IME and subtype"
James Dong [Fri, 10 Feb 2012 07:53:50 +0000 (23:53 -0800)]
Merge "move away from MediaDebug and use ADebug instead for video editor engine"
Scott Main [Fri, 10 Feb 2012 05:09:01 +0000 (21:09 -0800)]
Joe Fernandez [Fri, 10 Feb 2012 05:08:59 +0000 (21:08 -0800)]
am
d2deae8f: am
a300ea98: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
d2deae8f40d33ad69d92963a7fceb90ee3cae1ad':
Scott Main [Fri, 10 Feb 2012 05:08:58 +0000 (21:08 -0800)]
am
758fe151: am
cf18f420: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
758fe1511e499099deddcb94994b5d9a332062e1':
Scott Main [Fri, 10 Feb 2012 05:07:10 +0000 (21:07 -0800)]
Joe Fernandez [Fri, 10 Feb 2012 05:07:08 +0000 (21:07 -0800)]
am
a300ea98: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':
Scott Main [Fri, 10 Feb 2012 05:07:08 +0000 (21:07 -0800)]
am
cf18f420: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
cf18f42026b6dea9e1ec2f243718a6b7aebae3a2':
Dianne Hackborn [Fri, 10 Feb 2012 02:08:38 +0000 (18:08 -0800)]
Merge "Some hardening of isolated processes by restricting access to services."
Dianne Hackborn [Fri, 10 Feb 2012 00:12:18 +0000 (16:12 -0800)]
Some hardening of isolated processes by restricting access to services.
Services now must explicitly opt in to being accessed by isolated
processes. Currently only the activity manager and surface flinger
allow this. Activity manager is needed so that we can actually
bring up the process; SurfaceFlinger is needed to be able to get the
display information for creating the Configuration. The SurfaceFlinger
should be safe because the app doesn't have access to the window
manager so can't actually get a surface to do anything with.
The activity manager now protects most of its entry points against
isolated processes.
Change-Id: I0dad8cb2c873575c4c7659c3c2a7eda8e98f46b0
Fabrice Di Meglio [Fri, 10 Feb 2012 01:35:21 +0000 (17:35 -0800)]
Merge "Update BiDiTests app"
Scott Main [Fri, 10 Feb 2012 00:06:31 +0000 (16:06 -0800)]
Scott Main [Fri, 10 Feb 2012 00:04:15 +0000 (16:04 -0800)]
am
db7da7ee: am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
db7da7ee40231225861f4d39ea2f256bbca06f24':
docs: fix xss issue bug
5125642