OSDN Git Service
Svet Ganov [Wed, 3 Sep 2014 05:48:36 +0000 (05:48 +0000)]
am
87ca3b16: am
668b4765: Merge "Move print rendering in an isolated process." into lmp-dev
* commit '
87ca3b16be5933eb2cd5fdd250389d233ec924bc':
Move print rendering in an isolated process.
Adrian Roos [Wed, 3 Sep 2014 05:48:30 +0000 (05:48 +0000)]
am
42bbbeb2: am
be31021b: Merge "Disable touch dispatch while adjusting brightness" into lmp-dev
* commit '
42bbbeb2d9e85bc67235e6006cc1f1c7a27ac9b8':
Disable touch dispatch while adjusting brightness
Shri Borde [Wed, 3 Sep 2014 05:48:25 +0000 (05:48 +0000)]
am
be2ea906: am
fb909790: Merge "Bug
17243357: Remove MessagingConfigurationManager" into lmp-dev
* commit '
be2ea906d9ccb51bb9c188e868ae0297c1f25923':
Bug
17243357: Remove MessagingConfigurationManager
Adrian Roos [Wed, 3 Sep 2014 05:07:36 +0000 (05:07 +0000)]
am
0e15297c: am
c51688f7: Merge "Don\'t drop up or cancel touch events" into lmp-dev
* commit '
0e15297c65ee29c4f257e0a7a87f64592c3d01fd':
Don't drop up or cancel touch events
Svet Ganov [Tue, 2 Sep 2014 22:03:58 +0000 (22:03 +0000)]
am
668b4765: Merge "Move print rendering in an isolated process." into lmp-dev
* commit '
668b4765de3e97d69aaebb3bd58fe23eb800264d':
Move print rendering in an isolated process.
Adrian Roos [Tue, 2 Sep 2014 22:03:53 +0000 (22:03 +0000)]
am
be31021b: Merge "Disable touch dispatch while adjusting brightness" into lmp-dev
* commit '
be31021b4360f28e49da0bb654103520c9a2ad43':
Disable touch dispatch while adjusting brightness
Shri Borde [Tue, 2 Sep 2014 22:03:49 +0000 (22:03 +0000)]
am
fb909790: Merge "Bug
17243357: Remove MessagingConfigurationManager" into lmp-dev
* commit '
fb90979054c6800b00b8c4e2890f04f055b4077e':
Bug
17243357: Remove MessagingConfigurationManager
Svet Ganov [Tue, 2 Sep 2014 21:51:45 +0000 (21:51 +0000)]
Merge "Move print rendering in an isolated process." into lmp-dev
Adrian Roos [Tue, 2 Sep 2014 21:49:01 +0000 (21:49 +0000)]
Merge "Disable touch dispatch while adjusting brightness" into lmp-dev
Shri Borde [Tue, 2 Sep 2014 21:48:10 +0000 (21:48 +0000)]
Merge "Bug
17243357: Remove MessagingConfigurationManager" into lmp-dev
Adrian Roos [Tue, 2 Sep 2014 21:44:34 +0000 (21:44 +0000)]
am
c51688f7: Merge "Don\'t drop up or cancel touch events" into lmp-dev
* commit '
c51688f7c59890f31ffd8a6b79c083e4659dd087':
Don't drop up or cancel touch events
Adrian Roos [Tue, 2 Sep 2014 21:34:10 +0000 (23:34 +0200)]
Disable touch dispatch while adjusting brightness
Prevents new pointers from being added while the shade
is transparent so that nothing gets touched by accident.
Bug:
17113634
Change-Id: I4a607d08dbccd467280159060846edd32db9c512
Adrian Roos [Tue, 2 Sep 2014 21:35:59 +0000 (21:35 +0000)]
Merge "Don't drop up or cancel touch events" into lmp-dev
Adrian Roos [Tue, 2 Sep 2014 21:19:56 +0000 (23:19 +0200)]
Don't drop up or cancel touch events
Otherwise you're gonna have a bad time.
Bug:
17113634
Change-Id: I24fa13a4379bab0cef014010058d08096abda094
Shri Borde [Tue, 2 Sep 2014 16:48:49 +0000 (09:48 -0700)]
Bug
17243357: Remove MessagingConfigurationManager
It is replaced with SmsManager.getCarrierConfigValues
Change-Id: I560a53427b08746f2a7ed2e540ecb2c978b7ebd0
Jorim Jaggi [Tue, 2 Sep 2014 20:46:25 +0000 (20:46 +0000)]
am
4381bd8c: am
d9a773e5: Merge "Fix outdated time when turning on screen" into lmp-dev
* commit '
4381bd8cb57c26e2b3f5d2eb09783917357ab6b9':
Fix outdated time when turning on screen
Jean-Michel Trivi [Tue, 2 Sep 2014 20:46:20 +0000 (20:46 +0000)]
am
22a14cd2: am
73db0682: Merge "Restore permission check for mic muting" into lmp-dev
* commit '
22a14cd2d8d3fb0e5a9bd8bf9d6ecf1467c0579c':
Restore permission check for mic muting
Jorim Jaggi [Tue, 2 Sep 2014 20:36:04 +0000 (20:36 +0000)]
am
d9a773e5: Merge "Fix outdated time when turning on screen" into lmp-dev
* commit '
d9a773e51e6fcf7abbbcfd2c145e7e4e16c1282d':
Fix outdated time when turning on screen
Jean-Michel Trivi [Tue, 2 Sep 2014 20:35:59 +0000 (20:35 +0000)]
am
73db0682: Merge "Restore permission check for mic muting" into lmp-dev
* commit '
73db06820184c39c4e50e5be268a9e0f213a1a99':
Restore permission check for mic muting
Jorim Jaggi [Tue, 2 Sep 2014 20:26:38 +0000 (20:26 +0000)]
Merge "Fix outdated time when turning on screen" into lmp-dev
Mathieu Chartier [Tue, 2 Sep 2014 20:26:11 +0000 (20:26 +0000)]
am
d3f31288: am
b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev
* commit '
d3f312885208afca1d195fd5ac9059dd66dcb689':
Add missing null check to ninePatchInsets
Selim Cinek [Tue, 2 Sep 2014 20:26:06 +0000 (20:26 +0000)]
am
c82d8bb0: am
77258e4a: Merge "Notifications are now selectable by the Keyboard" into lmp-dev
* commit '
c82d8bb05d868c63d77439f9876a5c4670549c1b':
Notifications are now selectable by the Keyboard
Jorim Jaggi [Tue, 2 Sep 2014 20:26:02 +0000 (20:26 +0000)]
am
96cfaf50: am
a6399288: Merge "Remove different layout for landscape in Keyguard" into lmp-dev
* commit '
96cfaf50e14ecae7865de62d34d383b3cfc3578c':
Remove different layout for landscape in Keyguard
Jean-Michel Trivi [Tue, 2 Sep 2014 20:22:58 +0000 (20:22 +0000)]
Merge "Restore permission check for mic muting" into lmp-dev
Mathieu Chartier [Tue, 2 Sep 2014 20:14:25 +0000 (20:14 +0000)]
am
b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev
* commit '
b980f4607d67ccafb43d86e5fd7b35806b65acfa':
Add missing null check to ninePatchInsets
Selim Cinek [Tue, 2 Sep 2014 20:14:20 +0000 (20:14 +0000)]
am
77258e4a: Merge "Notifications are now selectable by the Keyboard" into lmp-dev
* commit '
77258e4a2349afa72f3110407717d5f090c22106':
Notifications are now selectable by the Keyboard
Jorim Jaggi [Tue, 2 Sep 2014 20:14:15 +0000 (20:14 +0000)]
am
a6399288: Merge "Remove different layout for landscape in Keyguard" into lmp-dev
* commit '
a63992888988017f664cc4c33ea1f0d546959b9d':
Remove different layout for landscape in Keyguard
Mathieu Chartier [Tue, 2 Sep 2014 20:01:59 +0000 (20:01 +0000)]
Merge "Add missing null check to ninePatchInsets" into lmp-dev
Jorim Jaggi [Tue, 2 Sep 2014 16:36:45 +0000 (18:36 +0200)]
Fix outdated time when turning on screen
Force a synchronous update of the clock view when turning on the
screen. Also wait for the Keyguard window to be drawn when turning
on the screen.
Bug:
16904617
Change-Id: I38f78a38cfe35ccd067cd420d2bad626bd955ad6
Selim Cinek [Tue, 2 Sep 2014 20:01:06 +0000 (20:01 +0000)]
Merge "Notifications are now selectable by the Keyboard" into lmp-dev
Jorim Jaggi [Tue, 2 Sep 2014 20:01:02 +0000 (20:01 +0000)]
Merge "Remove different layout for landscape in Keyguard" into lmp-dev
Dianne Hackborn [Tue, 2 Sep 2014 19:54:30 +0000 (19:54 +0000)]
am
3180e01c: am
30ccac80: Merge "Fix issue #
17322903: Crash in systemUI while launching an app from recents tab" into lmp-dev
* commit '
3180e01c59c78da8a8a7315f6b67b36ea09b0175':
Fix issue #
17322903: Crash in systemUI while launching an app from recents tab
Jorim Jaggi [Tue, 2 Sep 2014 19:53:36 +0000 (21:53 +0200)]
Remove different layout for landscape in Keyguard
Bug:
15422177
Change-Id: I8a643a8f6dcfed1530f17e8de6a5cc69533528b4
Chris Craik [Tue, 2 Sep 2014 19:54:24 +0000 (19:54 +0000)]
am
0d1a3fd3: am
f9b26725: Merge "Fix precision issues for roundrect clipping" into lmp-dev
* commit '
0d1a3fd3b846d858c321c634b605fd9fc63b57cd':
Fix precision issues for roundrect clipping
Dianne Hackborn [Tue, 2 Sep 2014 19:50:20 +0000 (19:50 +0000)]
am
30ccac80: Merge "Fix issue #
17322903: Crash in systemUI while launching an app from recents tab" into lmp-dev
* commit '
30ccac80f90d40db58d76e94ee658e05035df484':
Fix issue #
17322903: Crash in systemUI while launching an app from recents tab
Chris Craik [Tue, 2 Sep 2014 19:39:18 +0000 (19:39 +0000)]
am
f9b26725: Merge "Fix precision issues for roundrect clipping" into lmp-dev
* commit '
f9b26725a75e3793f0c0805a25e1e2e4c0974cce':
Fix precision issues for roundrect clipping
Dianne Hackborn [Tue, 2 Sep 2014 19:38:23 +0000 (19:38 +0000)]
Merge "Fix issue #
17322903: Crash in systemUI while launching an app from recents tab" into lmp-dev
Chris Craik [Tue, 2 Sep 2014 19:25:08 +0000 (19:25 +0000)]
Merge "Fix precision issues for roundrect clipping" into lmp-dev
Tsuwei Chen [Tue, 2 Sep 2014 19:14:03 +0000 (19:14 +0000)]
am
ad8eface: am
1c1a2cc9: Merge "Reload GPS configuration after carrier info is available. Bug:
17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e" into lmp-dev
* commit '
ad8eface55f8184eabbecc2b68f3901724bc3a87':
Reload GPS configuration after carrier info is available. Bug:
17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e
Tsuwei Chen [Tue, 2 Sep 2014 18:58:48 +0000 (18:58 +0000)]
am
1c1a2cc9: Merge "Reload GPS configuration after carrier info is available. Bug:
17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e" into lmp-dev
* commit '
1c1a2cc96aa427c4c719fd48e3ac00c81d73dc70':
Reload GPS configuration after carrier info is available. Bug:
17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e
Paul Lawrence [Tue, 2 Sep 2014 18:55:52 +0000 (18:55 +0000)]
am
60a85de8: am
4fdbcb33: Add constants so we can distinguish decryption failures
* commit '
60a85de8b99de43df5ea3de36d45831e2bdffe49':
Add constants so we can distinguish decryption failures
Paul Lawrence [Tue, 2 Sep 2014 18:42:49 +0000 (18:42 +0000)]
am
4fdbcb33: Add constants so we can distinguish decryption failures
* commit '
4fdbcb3312a85bfe1256144b27b58908aaf73a13':
Add constants so we can distinguish decryption failures
Svet Ganov [Fri, 29 Aug 2014 22:35:49 +0000 (15:35 -0700)]
Move print rendering in an isolated process.
Security review of the PDF rendering code revealed that it is
not sercure. Therefore, this code must be run in a sandbox.
This change moves the rendering code in an isolated process.
bug:
16897933
Change-Id: I711ce42a56892db1837950137bfaa79e1d61a7c4
Tsuwei Chen [Tue, 2 Sep 2014 18:36:36 +0000 (18:36 +0000)]
Merge "Reload GPS configuration after carrier info is available. Bug:
17110478 Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e" into lmp-dev
Christopher Tate [Tue, 2 Sep 2014 18:35:23 +0000 (18:35 +0000)]
am
f5fe379c: am
44cfdacb: Merge "Don\'t rewrite package restrictions unconditionally in findPreferredActivity()" into lmp-dev
* commit '
f5fe379c4a894426e2174ecca8cf0112971b127e':
Don't rewrite package restrictions unconditionally in findPreferredActivity()
Paul Lawrence [Thu, 28 Aug 2014 22:55:38 +0000 (15:55 -0700)]
Add constants so we can distinguish decryption failures
Bug:
17213613
Change-Id: I6bc10a1ed0855f6946ea9eb2f8d2db00c1af327c
Christopher Tate [Tue, 2 Sep 2014 18:22:30 +0000 (18:22 +0000)]
am
44cfdacb: Merge "Don\'t rewrite package restrictions unconditionally in findPreferredActivity()" into lmp-dev
* commit '
44cfdacbcc34ec8a20026041854c6e475b4adc9d':
Don't rewrite package restrictions unconditionally in findPreferredActivity()
Michael Wright [Tue, 2 Sep 2014 18:21:50 +0000 (18:21 +0000)]
am
6e0bd93a: am
b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev
* commit '
6e0bd93a2b7fc338c3ba64995cba309cd51035b6':
VirtualDisplay.Callbacks -> Callback
Jean-Michel Trivi [Tue, 2 Sep 2014 18:21:45 +0000 (18:21 +0000)]
am
26f51de0: am
cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev
* commit '
26f51de01c45e86c340efd783ea577719850be4a':
Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
Svet Ganov [Tue, 2 Sep 2014 18:21:31 +0000 (18:21 +0000)]
am
bafa690e: am
5906bbfb: Merge "Magnification bounds not always animated on a looper thread." into lmp-dev
* commit '
bafa690ec08223a1cf43fe1b598c68b579e91e76':
Magnification bounds not always animated on a looper thread.
Jorim Jaggi [Tue, 2 Sep 2014 18:21:26 +0000 (18:21 +0000)]
am
7256c156: am
9ffdc3bd: Merge "Use separate icon group for signal/battery in QS header" into lmp-dev
* commit '
7256c1560d3d52fff23d559eecd764dea1d7fcef':
Use separate icon group for signal/battery in QS header
Christopher Tate [Tue, 2 Sep 2014 18:09:07 +0000 (18:09 +0000)]
Merge "Don't rewrite package restrictions unconditionally in findPreferredActivity()" into lmp-dev
Michael Wright [Tue, 2 Sep 2014 18:01:49 +0000 (18:01 +0000)]
am
b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev
* commit '
b1ff74c91cf947246aa0f874030b82bff70e81fd':
VirtualDisplay.Callbacks -> Callback
Jean-Michel Trivi [Tue, 2 Sep 2014 18:01:45 +0000 (18:01 +0000)]
am
cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev
* commit '
cd46ad9833c8ed07d8a33e3925f7978d7d5c88a0':
Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
Svet Ganov [Tue, 2 Sep 2014 18:01:40 +0000 (18:01 +0000)]
am
5906bbfb: Merge "Magnification bounds not always animated on a looper thread." into lmp-dev
* commit '
5906bbfbed44245a917a9b88cf51aa88c17de993':
Magnification bounds not always animated on a looper thread.
Jorim Jaggi [Tue, 2 Sep 2014 18:01:36 +0000 (18:01 +0000)]
am
9ffdc3bd: Merge "Use separate icon group for signal/battery in QS header" into lmp-dev
* commit '
9ffdc3bd05cf7c3835014ac755ab023bf1d0367d':
Use separate icon group for signal/battery in QS header
Tyler Gunn [Tue, 2 Sep 2014 18:00:00 +0000 (18:00 +0000)]
am
a8c7d1bc: am
78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
* commit '
a8c7d1bcf5de323a8a5b8e3fff0c7759be06118e':
Remove "ask each time" SIP call setting. (1/2)
Dianne Hackborn [Tue, 2 Sep 2014 17:59:55 +0000 (17:59 +0000)]
am
4e784a50: am
4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
* commit '
4e784a505cb76e00e88dcf00c7b41b6ff0417964':
Hide the interaction part of VoiceInteractionService.
Michael Wright [Tue, 2 Sep 2014 17:54:44 +0000 (17:54 +0000)]
Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev
Jean-Michel Trivi [Tue, 2 Sep 2014 17:52:45 +0000 (17:52 +0000)]
Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev
Tyler Gunn [Tue, 2 Sep 2014 17:45:49 +0000 (17:45 +0000)]
am
78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
* commit '
78c0d4ab75c61efc48af1a698fd7d36620523866':
Remove "ask each time" SIP call setting. (1/2)
Dianne Hackborn [Tue, 2 Sep 2014 17:45:44 +0000 (17:45 +0000)]
am
4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
* commit '
4b9a934cef4de4985c0e316ef89ca41b3e720135':
Hide the interaction part of VoiceInteractionService.
Svet Ganov [Tue, 2 Sep 2014 17:43:17 +0000 (17:43 +0000)]
Merge "Magnification bounds not always animated on a looper thread." into lmp-dev
Jorim Jaggi [Tue, 2 Sep 2014 17:43:10 +0000 (17:43 +0000)]
Merge "Use separate icon group for signal/battery in QS header" into lmp-dev
Ronghua Wu [Tue, 2 Sep 2014 17:43:10 +0000 (17:43 +0000)]
am
eaa9befb: am
e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
* commit '
eaa9befb1e981d58a8e4d248c88d4fe204d06ea9':
API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
Yorke Lee [Tue, 2 Sep 2014 17:42:59 +0000 (17:42 +0000)]
am
659b0417: am
38a10cd4: Merge "Add lookup key to callerInfo" into lmp-dev
* commit '
659b0417d7ebb5069032c5c8fa685ac93bc6e11d':
Add lookup key to callerInfo
Amith Yamasani [Tue, 2 Sep 2014 17:42:54 +0000 (17:42 +0000)]
am
e681727f: am
9bdf3963: Merge "Make it possible to remove current user" into lmp-dev
* commit '
e681727f0106b67824e6315e5473232b42f54120':
Make it possible to remove current user
Jorim Jaggi [Tue, 2 Sep 2014 13:55:57 +0000 (15:55 +0200)]
Use separate icon group for signal/battery in QS header
This reverts the terrible hack that reattaches the system icons when
expanding QS. This primarily fixes that the alpha of the icons was
wrong when closing the shade, but also fixes flickering when expanding
the shade.
Bug:
17338013
Change-Id: Ifcbe03eca43ed7639059734e23d740c1b8a7a9de
Jean-Michel Trivi [Sat, 30 Aug 2014 01:14:09 +0000 (18:14 -0700)]
Restore permission check for mic muting
The implementation for AudioManager.setMicrophoneMute() used to
call directly into AudioSystem which called directly into
AudioFlinger and the mediaserver process, where the check for
the MODIFY_AUDIO_SETTINGS is performed.
A regression was introduced by Ib32138bcc256cfbac4fe21a090d5ba34f5c641fc
which calls first into AudioService which runs in system_process
before calling into AudioSystem, which granted the permission.
This CL adds a permission check in this code path when calling
AudioService.
Bug
17259652
Change-Id: I4ac5269262eb90df80ee81db6ec3d96977ee53be
Tyler Gunn [Tue, 2 Sep 2014 17:31:38 +0000 (17:31 +0000)]
Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
Dianne Hackborn [Tue, 2 Sep 2014 17:30:48 +0000 (17:30 +0000)]
Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
Dianne Hackborn [Sat, 30 Aug 2014 00:32:04 +0000 (17:32 -0700)]
Hide the interaction part of VoiceInteractionService.
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.
Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
Ronghua Wu [Tue, 2 Sep 2014 17:29:21 +0000 (17:29 +0000)]
am
e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
* commit '
e4999af808ac0e48932e3ac843df9bb9e6a45c46':
API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
Yorke Lee [Tue, 2 Sep 2014 17:29:16 +0000 (17:29 +0000)]
am
38a10cd4: Merge "Add lookup key to callerInfo" into lmp-dev
* commit '
38a10cd4bbe74c4d815810a759860e8da7c5e3a8':
Add lookup key to callerInfo
Amith Yamasani [Tue, 2 Sep 2014 17:29:12 +0000 (17:29 +0000)]
am
9bdf3963: Merge "Make it possible to remove current user" into lmp-dev
* commit '
9bdf3963a64d8eb0b66705da3922c464badaa539':
Make it possible to remove current user
Ronghua Wu [Tue, 2 Sep 2014 17:27:25 +0000 (17:27 +0000)]
Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
Yorke Lee [Tue, 2 Sep 2014 17:24:54 +0000 (17:24 +0000)]
Merge "Add lookup key to callerInfo" into lmp-dev
RoboErik [Tue, 2 Sep 2014 17:23:07 +0000 (17:23 +0000)]
am
c9942120: am
b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev
* commit '
c9942120358223073d440588a1b600ec84a023a8':
Update MediaBrowser to use String ids instead of Uris
Amith Yamasani [Tue, 2 Sep 2014 17:21:57 +0000 (17:21 +0000)]
Merge "Make it possible to remove current user" into lmp-dev
Nick Kralevich [Tue, 2 Sep 2014 17:15:42 +0000 (17:15 +0000)]
am
60888dba: am
0988daaa: Merge "Add testing api to SELinuxMMAC code."
* commit '
60888dbad1919634a61fc4f1e96126a3c387a228':
Add testing api to SELinuxMMAC code.
RoboErik [Tue, 2 Sep 2014 17:09:42 +0000 (17:09 +0000)]
am
b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev
* commit '
b7d24c7539ba40159a34ad1b7bcb173e3c066dc5':
Update MediaBrowser to use String ids instead of Uris
Nick Kralevich [Tue, 2 Sep 2014 17:03:32 +0000 (17:03 +0000)]
am
0988daaa: Merge "Add testing api to SELinuxMMAC code."
* commit '
0988daaa23b469b3021ad93f819736160e21391f':
Add testing api to SELinuxMMAC code.
RoboErik [Tue, 2 Sep 2014 16:58:29 +0000 (16:58 +0000)]
Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev
Nick Kralevich [Tue, 2 Sep 2014 16:52:13 +0000 (16:52 +0000)]
Merge "Add testing api to SELinuxMMAC code."
Robert Craig [Tue, 2 Sep 2014 11:16:52 +0000 (07:16 -0400)]
Add testing api to SELinuxMMAC code.
Added needed api for local unit testing.
Change-Id: If52555ecb4f0e6bc06e153b6a17e2c706b11253e
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Jae Seo [Tue, 2 Sep 2014 16:38:27 +0000 (16:38 +0000)]
am
88a6ada7: am
746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev
* commit '
88a6ada7ae19ebbed6419d4e60afac5162f744fa':
TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
Jae Seo [Tue, 2 Sep 2014 16:38:23 +0000 (16:38 +0000)]
am
057043e7: am
e42eaea7: Merge "TIF: Fix the Singapore content ratings" into lmp-dev
* commit '
057043e767aa3131158ef290e21f9f06faa04c55':
TIF: Fix the Singapore content ratings
George Mount [Tue, 2 Sep 2014 16:38:18 +0000 (16:38 +0000)]
am
8e95e5f7: am
8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
* commit '
8e95e5f75073aa7a43fba25ae9fc257ddc6159e6':
Update window always on convertTo/FromTranslucent
ztenghui [Tue, 2 Sep 2014 16:38:12 +0000 (16:38 +0000)]
am
f431aeab: am
bb63ef12: Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev
* commit '
f431aeab0db82bc7fdd0c50446990c4b7496609b':
Fix the (0,0) vector case for extra vertices computation
Sungsoo Lim [Tue, 2 Sep 2014 16:38:07 +0000 (16:38 +0000)]
am
9586eaa4: am
d15591a7: Merge "Do not show the input icon when it\'s not available." into lmp-dev
* commit '
9586eaa4a6add78595589539754531bb8ec623fc':
Do not show the input icon when it's not available.
Jae Seo [Tue, 2 Sep 2014 16:25:22 +0000 (16:25 +0000)]
am
746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev
* commit '
746a550b31627e3d40c416d7ef35ae351898b938':
TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
Jae Seo [Tue, 2 Sep 2014 16:25:18 +0000 (16:25 +0000)]
am
e42eaea7: Merge "TIF: Fix the Singapore content ratings" into lmp-dev
* commit '
e42eaea72d69c26b338d4783e4ff30e4f86b952b':
TIF: Fix the Singapore content ratings
George Mount [Tue, 2 Sep 2014 16:25:13 +0000 (16:25 +0000)]
am
8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
* commit '
8fd72d49213971e8a2ef84831c0035692a877870':
Update window always on convertTo/FromTranslucent
ztenghui [Tue, 2 Sep 2014 16:25:08 +0000 (16:25 +0000)]
am
bb63ef12: Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev
* commit '
bb63ef1298cf4505cfb44000d00c97e34fa975cb':
Fix the (0,0) vector case for extra vertices computation
Sungsoo Lim [Tue, 2 Sep 2014 16:25:03 +0000 (16:25 +0000)]
am
d15591a7: Merge "Do not show the input icon when it\'s not available." into lmp-dev
* commit '
d15591a70faf8890aab69c5e6bb51138e8241aea':
Do not show the input icon when it's not available.
Jae Seo [Tue, 2 Sep 2014 16:20:22 +0000 (16:20 +0000)]
Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev
Jae Seo [Tue, 2 Sep 2014 16:20:09 +0000 (16:20 +0000)]
Merge "TIF: Fix the Singapore content ratings" into lmp-dev
George Mount [Tue, 2 Sep 2014 16:20:05 +0000 (16:20 +0000)]
Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
ztenghui [Tue, 2 Sep 2014 16:17:00 +0000 (16:17 +0000)]
Merge "Fix the (0,0) vector case for extra vertices computation" into lmp-dev
Sungsoo Lim [Tue, 2 Sep 2014 16:16:01 +0000 (16:16 +0000)]
Merge "Do not show the input icon when it's not available." into lmp-dev
OSDN Git Service
