Nick Kralevich
e606757966
am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files."
...
* commit 'edb95c3f3ca4e51ef0432af925b8f4330e6dae81':
ZygoteInit: use correct header files.
2013-03-01 17:41:53 +00:00
Nick Kralevich
199f965552
am f5276c16: Merge "installd: use correct header file."
...
* commit 'f5276c16ad97d94f8773938012ae54f8c7ba450a':
installd: use correct header file.
2013-03-01 09:39:45 -08:00
Nick Kralevich
edb95c3f3c
am 937cfa77: Merge "ZygoteInit: use correct header files."
...
* commit '937cfa77c464f7dc13f686dc8f9f4667a17e80d6':
ZygoteInit: use correct header files.
2013-03-01 09:39:42 -08:00
Dmitry Shmidt
14b628a340
wifi: Add delimiter flag into bss scan results request
...
Change-Id: I2989ef1ee884db6add0405f36b628701aa928f69
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-03-01 09:37:00 -08:00
Bjorn Bringert
8d628f0c69
am bc086862: Declare VOICE_ASSIST intent
...
* commit 'bc086862e216bbe8ffc2dfb68f09a872505d9d48':
Declare VOICE_ASSIST intent
2013-03-01 17:21:32 +00:00
Baligh Uddin
a6d6564187
Import translations. DO NOT MERGE
...
Change-Id: I974b6c56bec344f2d4350e34b5e38ace9aaa2f31
Auto-generated-cl: translation import
2013-03-01 09:03:55 -08:00
Baligh Uddin
7c36114d7f
Import translations. DO NOT MERGE
...
Change-Id: I66270509422beeed4de4d5c7e94c62be82365a44
Auto-generated-cl: translation import
2013-03-01 08:55:13 -08:00
Nick Kralevich
f5276c16ad
Merge "installd: use correct header file."
2013-03-01 16:40:14 +00:00
Nick Kralevich
937cfa77c4
Merge "ZygoteInit: use correct header files."
2013-03-01 16:39:37 +00:00
Michael Jurka
e60bc7f2d8
Fix RTL layout in Recent Apps, landscape mode
...
Bug: 8067692
2013-03-01 16:00:32 +01:00
Bjorn Bringert
bc086862e2
Declare VOICE_ASSIST intent
...
Bug: 8289964
Change-Id: I241b5166a98a7a462691f0169bf1b6f4fe7b2e0f
2013-03-01 12:59:24 +00:00
Romain Guy
57b7725e9b
am 84ea20d0: Merge "Restore the ability to track native Surface changes Bug #8230990 " into jb-mr2-dev
...
* commit '84ea20d0ba7611782c7aa364cd41744fca359e35':
Restore the ability to track native Surface changes Bug #8230990
2013-03-01 02:40:13 +00:00
Jim Miller
17f509aefe
Re-enable USER_PRESENT broadcast in keyguard.
...
Change-Id: I0a1983d07bd81d3edf2b8bcb5e81e48613fc4205
2013-02-28 18:36:12 -08:00
Satoshi Kataoka
24364451c3
Merge "Add a comment for secondary user handling in IMMS"
2013-03-01 02:34:11 +00:00
Romain Guy
84ea20d0ba
Merge "Restore the ability to track native Surface changes Bug #8230990 " into jb-mr2-dev
2013-03-01 02:33:50 +00:00
Romain Guy
8b5aa48469
Restore the ability to track native Surface changes
...
Bug #8230990
ViewRootImpl needs to know when the native Surface objects changes
to recreate the EGL surface. A recent refactoring in Surface broke
the behavior of getGenerationId(). This simply restores the old
behavior (every change increments the generation ID by 1.)
Change-Id: Ife1df1ffb2ee7a373b8ebf2431192702ba10f344
2013-02-28 18:16:31 -08:00
Jim Miller
83178a6791
Merge "Post-review Keyguard cleanup."
2013-03-01 02:07:27 +00:00
Svetoslav
6b25e726cb
Remove a workaround for accessibility managers that works across users.
...
The system and some processes such as the keyguard and system UI
run across users. Hence, the local accessibility manager should call
into the backing system service with the id of the current user.
For all other processes the local manager uses the current user id.
There was a method that is to be called before the local accessibility
manager has been accessed to initialize it to work across users.
This had to be done for keyguard and system UI.
This change removed the workaround and now the local accessibility
manager determines under the hood which user id to use while calling
into the system. If the local manager is in the system process or
its process has permissions to work across uses, the manager uses
UserHandle.USER_CURRENT, otherwise it uses the user if its process.
Change-Id: I3e97fe98805adca01c1a0127a276828e90926f95
2013-02-28 17:57:29 -08:00
Jim Miller
25190577cc
Post-review Keyguard cleanup.
...
- remove userActivity() from KeyguardService interface and call it
on PowerManager directly
- Split IKeyguardResult into two parts: IKeyguardShowCallback and
IKeyguardExitCallback.
- Misc other changes from the review.
Change-Id: I3f679cfa5d3f8bc742f2b2259ac354045e89a87b
2013-02-28 17:41:34 -08:00
Chris Craik
32e18d9f32
am cccd6c67: Merge "Avoid trying to draw invisible ShapeDrawables" into jb-mr2-dev
...
* commit 'cccd6c67db8c610bcaa469e0e1b808eb98807453':
Avoid trying to draw invisible ShapeDrawables
2013-03-01 01:22:37 +00:00
Chris Craik
cccd6c67db
Merge "Avoid trying to draw invisible ShapeDrawables" into jb-mr2-dev
2013-03-01 01:16:44 +00:00
Chris Craik
f0e0678460
Avoid trying to draw invisible ShapeDrawables
...
This avoids work when a drawable is declared with @android:color/transparent
Change-Id: I1b6d3b22751e378be047a5538dfd4d4baab3c03a
2013-02-28 17:05:12 -08:00
Jeff Sharkey
6d248625d3
am 7f61d014: Merge "Allow loopback traffic in lockdown mode." into jb-mr2-dev
...
* commit '7f61d0146e48275bf372e6b1ea82d2f48163c73d':
Allow loopback traffic in lockdown mode.
2013-03-01 01:03:27 +00:00
Jeff Sharkey
7f61d0146e
Merge "Allow loopback traffic in lockdown mode." into jb-mr2-dev
2013-03-01 00:58:32 +00:00
Jeff Sharkey
812085bc70
Allow loopback traffic in lockdown mode.
...
Bug: 8245184
Change-Id: If993e3d6f5c7ce5970bfe701074c85b9245aa2aa
2013-02-28 16:57:58 -08:00
Nick Kralevich
b3c4a0bb5c
ZygoteInit: use correct header files.
...
Don't define capget / capset when we already have definitions
of it in our header files.
Change-Id: Ia2d7e408879bd09019f99aef52acb63a7a243d48
2013-02-28 16:56:16 -08:00
Jeff Sharkey
ce43e009e6
am f5e04717: Merge "Tighten enforcement of file modes." into jb-mr2-dev
...
* commit 'f5e0471703d73a1285601928b790cdf0ab028fa5':
Tighten enforcement of file modes.
2013-03-01 00:49:33 +00:00
Jeff Sharkey
f5e0471703
Merge "Tighten enforcement of file modes." into jb-mr2-dev
2013-03-01 00:44:41 +00:00
Nick Kralevich
848b4c9a97
installd: use correct header file.
...
Change-Id: I035524b857a04f8400e96468310d88abf247e582
2013-02-28 16:43:23 -08:00
Lorenzo Colitti
30929b758d
am 51019a0f: Merge "Expose clatd commands to NetworkManagementService." into jb-mr2-dev
...
* commit '51019a0fc7135ecb7cc965a80c6e5d13ae23a701':
Expose clatd commands to NetworkManagementService.
2013-03-01 00:21:39 +00:00
Lorenzo Colitti
51019a0fc7
Merge "Expose clatd commands to NetworkManagementService." into jb-mr2-dev
2013-03-01 00:15:44 +00:00
Romain Guy
d06cfccf84
am 1361dff5: Merge "Support 3D rotations when drawing text" into jb-mr2-dev
...
* commit '1361dff5eb54b9b02b4d1a2d3e2ed3afd216d79d':
Support 3D rotations when drawing text
2013-03-01 00:11:19 +00:00
Chris Craik
fcdfff575a
am f999879c: Merge "Account for text alignment in Op bounds calculation" into jb-mr2-dev
...
* commit 'f999879ce01117ea8ca292403a7104b0e7d46bdc':
Account for text alignment in Op bounds calculation
2013-03-01 00:07:51 +00:00
Romain Guy
1361dff5eb
Merge "Support 3D rotations when drawing text" into jb-mr2-dev
2013-03-01 00:05:51 +00:00
Romain Guy
a4adcf0239
Support 3D rotations when drawing text
...
If a perspective transform is set on the Canvas, drawText() should
not attempt to rasterize glyphs in screen space. This change uses
the old behavior instead (i.e. rasterize the glyphs at the native
font size and apply the transform on the resulting mesh.)
This change also adds an optimization: empty glyphs (spaces) do
not generate vertices anymore. This saves a lot of vertices in text
heavy applications such as Gmail.
Change-Id: Ib531384163f5165b5785501612a7b1474f3ff599
2013-02-28 16:04:48 -08:00
Chris Craik
f999879ce0
Merge "Account for text alignment in Op bounds calculation" into jb-mr2-dev
2013-03-01 00:01:15 +00:00
Tim Murray
581488fcfd
am 31a3ed4e: Merge "Add support and better exceptions for Bitmaps with a null config." into jb-mr2-dev
...
* commit '31a3ed4ed484cce71213700c2a659a55c45e7288':
Add support and better exceptions for Bitmaps with a null config.
2013-03-01 00:00:07 +00:00
Jeff Sharkey
ba761979ee
Tighten enforcement of file modes.
...
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2013-02-28 15:57:36 -08:00
Tim Murray
31a3ed4ed4
Merge "Add support and better exceptions for Bitmaps with a null config." into jb-mr2-dev
2013-02-28 23:52:37 +00:00
Jonathan Dixon
a280b5f9f7
am 68770066: Merge "Fix javadoc build" into jb-mr2-dev
...
* commit '6877006646db987db8148117fcdde313d84a93e7':
Fix javadoc build
2013-02-28 23:43:18 +00:00
Jonathan Dixon
6877006646
Merge "Fix javadoc build" into jb-mr2-dev
2013-02-28 23:37:23 +00:00
Jonathan Dixon
98fac170b1
Fix javadoc build
...
Change-Id: I99eb6713fb221e1a3a8e54d621038104913dc03a
2013-02-28 15:32:10 -08:00
Stephen Hines
55aa9aef02
am e70e8bec: Merge "Fix docs bug." into jb-mr2-dev
...
* commit 'e70e8becf35696d68410a4f66a51da97b3402d2b':
Fix docs bug.
2013-02-28 22:39:07 +00:00
Dianne Hackborn
1010a6ec67
am d6a3e485: Merge "Unify normal and overlay action bar layouts." into jb-mr2-dev
...
* commit 'd6a3e485b58e23808b44b8f2374e67e891cfae05':
Unify normal and overlay action bar layouts.
2013-02-28 22:39:03 +00:00
Jonathan Dixon
ea48c442be
am 0af1c597: Merge "Deprecate various WebView related methods" into jb-mr2-dev
...
* commit '0af1c59762d0cad2ef9755b15217a253cbb32005':
Deprecate various WebView related methods
2013-02-28 22:39:00 +00:00
Romain Guy
489bc9d353
am aaa46155: Merge "Reorganize OpenGL renderer tests" into jb-mr2-dev
...
* commit 'aaa46155ec80f02b37ec858408d7dabbf9bc289a':
Reorganize OpenGL renderer tests
2013-02-28 22:38:53 +00:00
Matthew Xie
9e0a566839
am 23b046c4: Merge "Initial version of BLE support for Bluedroid" into jb-mr2-dev
...
* commit '23b046c4af6672d96a4ef7bb27fb444e40f0bd5d':
Initial version of BLE support for Bluedroid
2013-02-28 22:38:38 +00:00
Derek Sollenberger
ea104b64f4
am 5b6591c1: fix issue when replacement bitmap is larger than original.
...
* commit '5b6591c1d058a2c8008ba6f77ee0e978a84b78e9':
fix issue when replacement bitmap is larger than original.
2013-02-28 22:38:33 +00:00
Dirk Dougherty
bf50ede4cf
am c732976e: am 08a551b4: am f132ac4f: am ac6a76d2: am f19dd2b5: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev
...
* commit 'c732976e6b40be5a23eee2df2bff23101abc1f91':
Doc change: update 'multiple apks' criteria in filters doc.
2013-02-28 22:38:10 +00:00
Svetoslav
e71384bcce
am 2a45b9fe: Merge "Fake accessibility service used by UiAutomation not destroyed." into jb-mr2-dev
...
* commit '2a45b9fe99b10baeedb9c4529dcc5177ad7e3584':
Fake accessibility service used by UiAutomation not destroyed.
2013-02-28 22:38:05 +00:00