OSDN Git Service
Jason Monk [Mon, 11 Aug 2014 19:25:26 +0000 (19:25 +0000)]
am
a68f3a16: am
ce58bb7d: Merge "Make simple user switcher notice setting changes." into lmp-dev
* commit '
a68f3a16ca196289798941141ef689c021bee5b2':
Make simple user switcher notice setting changes.
Ricardo Cervera [Mon, 11 Aug 2014 19:25:21 +0000 (19:25 +0000)]
am
408bc8e9: am
8dbfc002: am
18718444: am
97dbb136: am
6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
* commit '
408bc8e9fe174e4200bba5f7a1e33b6c341aeb5e':
docs: Fixed minor issue with Studio shortcuts
Jason Monk [Mon, 11 Aug 2014 19:20:47 +0000 (19:20 +0000)]
am
ce58bb7d: Merge "Make simple user switcher notice setting changes." into lmp-dev
* commit '
ce58bb7dc7eb4f5f253a46941fbc22d869138b99':
Make simple user switcher notice setting changes.
Ricardo Cervera [Mon, 11 Aug 2014 19:20:42 +0000 (19:20 +0000)]
am
8dbfc002: am
18718444: am
97dbb136: am
6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
* commit '
8dbfc0024199d9b98f1bf2d31ab5d53403773314':
docs: Fixed minor issue with Studio shortcuts
Ricardo Cervera [Mon, 11 Aug 2014 19:15:02 +0000 (19:15 +0000)]
am
18718444: am
97dbb136: am
6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
* commit '
18718444b99b4b631021d5452161c7338cb99473':
docs: Fixed minor issue with Studio shortcuts
Jason Monk [Mon, 11 Aug 2014 19:16:13 +0000 (19:16 +0000)]
Merge "Make simple user switcher notice setting changes." into lmp-dev
Jason Monk [Mon, 11 Aug 2014 17:42:32 +0000 (13:42 -0400)]
Make simple user switcher notice setting changes.
To do this just check the state from the controller (which listens
for changes), rather than holding state locally.
Bug:
16888009
Change-Id: Ifdbf0055c7aa100941c6504cf3f469031c9c6e43
Adam Powell [Mon, 11 Aug 2014 18:12:58 +0000 (11:12 -0700)]
resolved conflicts for merge of
8432e77b to lmp-dev-plus-aosp
Change-Id: I622670a390550e45cc9411f5071d50245d8e9ebd
Adam Lesinski [Mon, 11 Aug 2014 18:03:20 +0000 (18:03 +0000)]
am
ff8afc33: am
248da634: Merge "Fix shared library bug in bag attributes" into lmp-dev
* commit '
ff8afc3309d98796767a8859a9a2e262fe1fc165':
Fix shared library bug in bag attributes
Adam Lesinski [Mon, 11 Aug 2014 17:55:35 +0000 (17:55 +0000)]
am
248da634: Merge "Fix shared library bug in bag attributes" into lmp-dev
* commit '
248da6345d7a0f287fc2867cd1bd02dee129f201':
Fix shared library bug in bag attributes
Adam Powell [Mon, 11 Aug 2014 17:52:03 +0000 (17:52 +0000)]
am
dafcc610: Merge "Don\'t unnecessarily set LayoutParams on children"
* commit '
dafcc61078cca409abd77516ce7ccee1eb60db2a':
Don't unnecessarily set LayoutParams on children
Selim Cinek [Mon, 11 Aug 2014 17:40:46 +0000 (17:40 +0000)]
am
852568ff: am
e2727043: Merge "Changed the color of low-priority notifications" into lmp-dev
* commit '
852568ff1c07c2308b73091de51c4fb03f3a04e9':
Changed the color of low-priority notifications
Selim Cinek [Mon, 11 Aug 2014 17:40:42 +0000 (17:40 +0000)]
am
d8dd29f9: am
68597329: Merge "Fixed an animation bug with inline view updates" into lmp-dev
* commit '
d8dd29f9864662028cbde11711447649ce261a98':
Fixed an animation bug with inline view updates
Selim Cinek [Mon, 11 Aug 2014 17:33:31 +0000 (17:33 +0000)]
am
e2727043: Merge "Changed the color of low-priority notifications" into lmp-dev
* commit '
e27270434eaecdd080e71900833c4fbd9bce3d75':
Changed the color of low-priority notifications
Selim Cinek [Mon, 11 Aug 2014 17:33:26 +0000 (17:33 +0000)]
am
68597329: Merge "Fixed an animation bug with inline view updates" into lmp-dev
* commit '
68597329a7259333f56a856032f71f0ee44b493a':
Fixed an animation bug with inline view updates
Sandeep Siddhartha [Mon, 11 Aug 2014 17:23:48 +0000 (17:23 +0000)]
am
650c3649: am
361c8fbd: Merge "Remove direct field access from event payload" into lmp-dev
* commit '
650c3649af8c4e619e5cb8997eb5b67cc8c4a63e':
Remove direct field access from event payload
Sandeep Siddhartha [Mon, 11 Aug 2014 17:23:44 +0000 (17:23 +0000)]
am
935bb342: am
69ae4519: Merge "Add debugging info to VIS via dump()" into lmp-dev
* commit '
935bb342a8664efae9a404d509f32401b532a609':
Add debugging info to VIS via dump()
Sandeep Siddhartha [Mon, 11 Aug 2014 17:20:21 +0000 (17:20 +0000)]
am
361c8fbd: Merge "Remove direct field access from event payload" into lmp-dev
* commit '
361c8fbdcd235febf97556c9b5dcc799dfe4fbb6':
Remove direct field access from event payload
Sandeep Siddhartha [Mon, 11 Aug 2014 17:20:15 +0000 (17:20 +0000)]
am
69ae4519: Merge "Add debugging info to VIS via dump()" into lmp-dev
* commit '
69ae451980f6065fb9668ca9cb203cf14e1c8c58':
Add debugging info to VIS via dump()
Adam Lesinski [Mon, 11 Aug 2014 17:49:50 +0000 (17:49 +0000)]
Merge "Fix shared library bug in bag attributes" into lmp-dev
Selim Cinek [Mon, 11 Aug 2014 17:28:37 +0000 (17:28 +0000)]
Merge "Changed the color of low-priority notifications" into lmp-dev
Selim Cinek [Mon, 11 Aug 2014 17:28:25 +0000 (17:28 +0000)]
Merge "Fixed an animation bug with inline view updates" into lmp-dev
Sandeep Siddhartha [Mon, 11 Aug 2014 17:15:57 +0000 (17:15 +0000)]
Merge "Remove direct field access from event payload" into lmp-dev
Sandeep Siddhartha [Mon, 11 Aug 2014 17:14:55 +0000 (17:14 +0000)]
Merge "Add debugging info to VIS via dump()" into lmp-dev
Sandeep Siddhartha [Sat, 9 Aug 2014 01:29:43 +0000 (18:29 -0700)]
Remove direct field access from event payload
Change-Id: I0b4462e56a977bfbaaebd2dd31d9246051af1b99
Yorke Lee [Mon, 11 Aug 2014 16:52:59 +0000 (16:52 +0000)]
am
b0c60f1b: am
b789a8ee: Block access to call logs from the corp profile
* commit '
b0c60f1b858b51e11f6715fe1ed078255cff1cd5':
Block access to call logs from the corp profile
Yorke Lee [Mon, 11 Aug 2014 16:49:54 +0000 (16:49 +0000)]
am
b789a8ee: Block access to call logs from the corp profile
* commit '
b789a8eea4e9c94617c8c9540bdd22739cae3e3f':
Block access to call logs from the corp profile
Yorke Lee [Sun, 10 Aug 2014 20:52:21 +0000 (13:52 -0700)]
Block access to call logs from the corp profile
Bug:
16812842
Change-Id: Ie4342b5efb2419097c35c0ddebd486a098cea523
Sandeep Siddhartha [Fri, 8 Aug 2014 22:28:46 +0000 (15:28 -0700)]
Add debugging info to VIS via dump()
Change-Id: I9e8f4536de309256db835b30d94765bfc27d4e80
Adam Lesinski [Fri, 8 Aug 2014 22:32:40 +0000 (15:32 -0700)]
Fix shared library bug in bag attributes
A ResTable_map entry has a name attribute, which
could be a dynamic reference if it comes from
a shared library. It was not being patched with
the correct package id.
Bug:
16795890
Change-Id: Ia8df6a943269b2fefb2132c3ed74eb1997d7701b
Selim Cinek [Mon, 11 Aug 2014 15:48:57 +0000 (17:48 +0200)]
Changed the color of low-priority notifications
Bug:
16010701
Change-Id: I7afc351a5a669bbb71b2620afe310b250da66b77
Selim Cinek [Mon, 11 Aug 2014 15:35:48 +0000 (17:35 +0200)]
Fixed an animation bug with inline view updates
The height is now updated in an animated fashion.
Bug:
16947659
Change-Id: I4e89e6ca78f8d3c0f1e6f7eb61134a394c6d7d73
Etan Cohen [Mon, 11 Aug 2014 15:51:31 +0000 (15:51 +0000)]
am
20cde281: am
053bc0c9: Add configuration flag controlling whether IMS can be completely disabled.
* commit '
20cde2816718a25a378e4ad0bbe736290d85ca25':
Add configuration flag controlling whether IMS can be completely disabled.
Etan Cohen [Mon, 11 Aug 2014 15:48:21 +0000 (15:48 +0000)]
am
053bc0c9: Add configuration flag controlling whether IMS can be completely disabled.
* commit '
053bc0c9507cab9ea9f0da8a4df51932847ac8ca':
Add configuration flag controlling whether IMS can be completely disabled.
Etan Cohen [Fri, 8 Aug 2014 22:44:23 +0000 (15:44 -0700)]
Add configuration flag controlling whether IMS can be completely disabled.
Change-Id: I70e6fc163d65bba7d1260df0acb74ca614e54b68
Craig Stout [Mon, 11 Aug 2014 15:22:05 +0000 (15:22 +0000)]
am
1a11124f: am
a0fb1aa2: Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev
* commit '
1a11124fead819ecdef384aa0714970c047ac493':
Fix NPEs when inflating a ValueAnimator.
Ricardo Cervera [Mon, 11 Aug 2014 15:22:03 +0000 (15:22 +0000)]
am
97dbb136: am
6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
* commit '
97dbb136473b18a6d7171577ef2a7136819b4a18':
docs: Fixed minor issue with Studio shortcuts
Ricardo Cervera [Mon, 11 Aug 2014 15:17:27 +0000 (15:17 +0000)]
am
6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
* commit '
6bb49e4ae629e3740cd3a623fcc115f895f3188c':
docs: Fixed minor issue with Studio shortcuts
Craig Stout [Mon, 11 Aug 2014 15:17:20 +0000 (15:17 +0000)]
am
a0fb1aa2: Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev
* commit '
a0fb1aa29cf5238743f114fb3a01992df1d445ed':
Fix NPEs when inflating a ValueAnimator.
Barnaby James [Mon, 11 Aug 2014 14:40:55 +0000 (14:40 +0000)]
am
fc5a45fd: am
57ab4478: Merge "Make Test Voice Interactor support new requirements." into lmp-dev
* commit '
fc5a45fdcf843fb1e6ecb3b45b40f792edc548eb':
Make Test Voice Interactor support new requirements.
John Spurlock [Mon, 11 Aug 2014 14:40:50 +0000 (14:40 +0000)]
am
e895d43e: am
632fc874: Merge "QS: Fix some QS layout issues." into lmp-dev
* commit '
e895d43e9640b1e38c86af4e1556c5f88fd07241':
QS: Fix some QS layout issues.
Barnaby James [Mon, 11 Aug 2014 14:36:41 +0000 (14:36 +0000)]
am
57ab4478: Merge "Make Test Voice Interactor support new requirements." into lmp-dev
* commit '
57ab447892dae276723594c0e993525b2fe6bd0d':
Make Test Voice Interactor support new requirements.
John Spurlock [Mon, 11 Aug 2014 14:36:37 +0000 (14:36 +0000)]
am
632fc874: Merge "QS: Fix some QS layout issues." into lmp-dev
* commit '
632fc8746aa1a50decee99ad8d25726f5cdec73f':
QS: Fix some QS layout issues.
Jae Seo [Mon, 11 Aug 2014 14:30:03 +0000 (14:30 +0000)]
am
64199ece: am
7a85f00c: Merge "Ensure that custom label isn\'t empty" into lmp-dev
* commit '
64199eceeb471f02fc2579849b86ca822d101865':
Ensure that custom label isn't empty
Jae Seo [Mon, 11 Aug 2014 14:26:13 +0000 (14:26 +0000)]
am
7a85f00c: Merge "Ensure that custom label isn\'t empty" into lmp-dev
* commit '
7a85f00cfca8f9adcdc9a237d603ebab72245da4':
Ensure that custom label isn't empty
Nicolas Prevot [Mon, 11 Aug 2014 12:55:11 +0000 (12:55 +0000)]
am
299c4d58: am
fb9364dc: Merge "Removing the personal icon, which was only a placeholder." into lmp-dev
* commit '
299c4d580a4b14fcd663cba1f830b55edda8a8b3':
Removing the personal icon, which was only a placeholder.
Nicolas Prevot [Mon, 11 Aug 2014 12:50:48 +0000 (12:50 +0000)]
am
fb9364dc: Merge "Removing the personal icon, which was only a placeholder." into lmp-dev
* commit '
fb9364dcd527108a21948fc16912b7bf1a7f9b09':
Removing the personal icon, which was only a placeholder.
Yohei Yukawa [Mon, 11 Aug 2014 12:03:08 +0000 (12:03 +0000)]
am
f78bd39c: am
548449f8: Merge "Fix handling of line-end and RTL characters in CursorAnchorInfo" into lmp-dev
* commit '
f78bd39cdfa72cbd8a736f28107826a16126712f':
Fix handling of line-end and RTL characters in CursorAnchorInfo
Yohei Yukawa [Mon, 11 Aug 2014 11:59:01 +0000 (11:59 +0000)]
am
548449f8: Merge "Fix handling of line-end and RTL characters in CursorAnchorInfo" into lmp-dev
* commit '
548449f8313506efe5d6f8fb584910ba2c642355':
Fix handling of line-end and RTL characters in CursorAnchorInfo
Calin Juravle [Mon, 11 Aug 2014 11:23:48 +0000 (11:23 +0000)]
am
baf366f0: am
96122e52: Pass the name of the native bridge library to the runtime
* commit '
baf366f02dc999dae99e03e565a4dd21f79357ac':
Pass the name of the native bridge library to the runtime
Calin Juravle [Mon, 11 Aug 2014 11:19:55 +0000 (11:19 +0000)]
am
96122e52: Pass the name of the native bridge library to the runtime
* commit '
96122e521066099ef61235b92962df6156d2a6b0':
Pass the name of the native bridge library to the runtime
Calin Juravle [Thu, 7 Aug 2014 13:45:53 +0000 (14:45 +0100)]
Pass the name of the native bridge library to the runtime
Bug:
16843953
(cherry picked from commit
2f4cf2cfd1125abfe928d6137f3d1553b0888f61)
Change-Id: I223f9041e424be024265e46bcff19cd9dfd18dfc
Piotr Jastrzebski [Mon, 11 Aug 2014 10:04:56 +0000 (10:04 +0000)]
am
388aedee: am
07291ccc: Merge "Remove memory leak."
* commit '
388aedee0483ed7132849584816b86c1a4377799':
Remove memory leak.
Piotr Jastrzebski [Mon, 11 Aug 2014 09:59:24 +0000 (09:59 +0000)]
am
07291ccc: Merge "Remove memory leak."
* commit '
07291cccc0348b5783659909a38e7fbd207f9605':
Remove memory leak.
Yuncheol Heo [Mon, 11 Aug 2014 08:51:16 +0000 (08:51 +0000)]
am
5fc018ad: am
41824e71: Merge "Make it not to go to sleep when changing TV\'s input to the others." into lmp-dev
* commit '
5fc018ad90af7b8909a061f7b7b29fa90d507382':
Make it not to go to sleep when changing TV's input to the others.
Yuncheol Heo [Mon, 11 Aug 2014 08:46:52 +0000 (08:46 +0000)]
am
41824e71: Merge "Make it not to go to sleep when changing TV\'s input to the others." into lmp-dev
* commit '
41824e71fb88d87bb8efa4c3ef63b01abb329555':
Make it not to go to sleep when changing TV's input to the others.
Sungsoo Lim [Mon, 11 Aug 2014 08:34:58 +0000 (08:34 +0000)]
am
0cef2290: am
ac47111f: Merge "TIF: Add content rating systems" into lmp-dev
* commit '
0cef229038f36e0ca2a169b23c808489a9e67363':
TIF: Add content rating systems
Sungsoo Lim [Mon, 11 Aug 2014 08:30:26 +0000 (08:30 +0000)]
am
ac47111f: Merge "TIF: Add content rating systems" into lmp-dev
* commit '
ac47111ffbf430acb1d867ab0588055933ef124f':
TIF: Add content rating systems
Jungshik Jang [Mon, 11 Aug 2014 05:42:56 +0000 (05:42 +0000)]
am
07064572: am
86226886: Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.
* commit '
07064572f0a5c30a9b3e31443844ab17c4aeef58':
Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.
Jungshik Jang [Mon, 11 Aug 2014 05:39:30 +0000 (05:39 +0000)]
am
86226886: Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.
* commit '
862268860939a8d5002402ceaa4629cf238b8494':
Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.
Jungshik Jang [Mon, 11 Aug 2014 05:04:25 +0000 (05:04 +0000)]
am
a0c9c8de: am
05df974a: Hook up device power status change to TIF
* commit '
a0c9c8de19af17df005dcf24a9d2222910f79de6':
Hook up device power status change to TIF
Jungshik Jang [Mon, 11 Aug 2014 04:56:58 +0000 (04:56 +0000)]
am
05df974a: Hook up device power status change to TIF
* commit '
05df974a127a6c4b38a030d449d54d336813bfc1':
Hook up device power status change to TIF
Jungshik Jang [Fri, 8 Aug 2014 01:46:54 +0000 (10:46 +0900)]
Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.
This is to update audio patch when HDMI-CEC system audio mode is changed.
Bug:
16113320
Change-Id: I312fffe511c0bce1c973bb66e9c16875e5dcee56
Jungshik Jang [Fri, 8 Aug 2014 02:38:28 +0000 (11:38 +0900)]
Hook up device power status change to TIF
Instead of introducing new api update existing
IDeviceEventListener
Bug:
16445063
Change-Id: I93bfc736a06a78e83c95877a53f4f241b51ed9c0
Jeff Sharkey [Sun, 10 Aug 2014 23:19:20 +0000 (23:19 +0000)]
am
5d765bc0: am
38b7ea4c: Merge "GID-based permissions are defined by "android"." into lmp-dev
* commit '
5d765bc008bf5563d7b9e9c62f8b67a2c1f4b69b':
GID-based permissions are defined by "android".
Jeff Sharkey [Sun, 10 Aug 2014 23:15:22 +0000 (23:15 +0000)]
am
38b7ea4c: Merge "GID-based permissions are defined by "android"." into lmp-dev
* commit '
38b7ea4cf1b3cf5dfc6e7c59a5a37e8f8f6bf098':
GID-based permissions are defined by "android".
Vinit Deshpande [Sun, 10 Aug 2014 22:07:03 +0000 (22:07 +0000)]
am
e46382b1: am
bac93970: Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev
* commit '
e46382b1b4fc1b7968e229c46f2eb8e2527baeb6':
Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE
Vinit Deshpande [Sun, 10 Aug 2014 22:03:55 +0000 (22:03 +0000)]
am
bac93970: Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev
* commit '
bac9397083b220fd9d6ae3c24beafebf790f3f18':
Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE
Vinit Deshpande [Sun, 10 Aug 2014 20:31:09 +0000 (20:31 +0000)]
am
cfa27b6d: am
70825f5c: Merge "Support EAP-SIM and EAP-AKA" into lmp-dev
* commit '
cfa27b6d91d9ecd0a2e18e0c8b01da352c2c4151':
Support EAP-SIM and EAP-AKA
Vinit Deshpande [Sun, 10 Aug 2014 20:27:23 +0000 (20:27 +0000)]
am
70825f5c: Merge "Support EAP-SIM and EAP-AKA" into lmp-dev
* commit '
70825f5c3f1b4426984ca188f64d38db3be37b0e':
Support EAP-SIM and EAP-AKA
Christopher Tate [Sun, 10 Aug 2014 19:44:28 +0000 (19:44 +0000)]
am
8cc1ce7f: am
932cd04a: Merge "Start using cancelFullBackup() when appropriate" into lmp-dev
* commit '
8cc1ce7f2f2240ec29a28144ce4f0e66bd425aa2':
Start using cancelFullBackup() when appropriate
Craig Stout [Mon, 11 Aug 2014 15:12:29 +0000 (15:12 +0000)]
Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev
Barnaby James [Mon, 11 Aug 2014 14:31:39 +0000 (14:31 +0000)]
Merge "Make Test Voice Interactor support new requirements." into lmp-dev
Christopher Tate [Sun, 10 Aug 2014 19:41:11 +0000 (19:41 +0000)]
am
932cd04a: Merge "Start using cancelFullBackup() when appropriate" into lmp-dev
* commit '
932cd04a891f342501ef26a572a84986feab47c5':
Start using cancelFullBackup() when appropriate
Jae Seo [Sun, 10 Aug 2014 17:49:22 +0000 (17:49 +0000)]
am
8afbd208: am
44a3a39c: Merge "TIF: Move watch history logging to TvProvider" into lmp-dev
* commit '
8afbd208fc5e303d1801d4228743ffdf59bf3c80':
TIF: Move watch history logging to TvProvider
Jean-Michel Trivi [Sun, 10 Aug 2014 17:44:52 +0000 (17:44 +0000)]
am
d6dfeaaa: am
0939dd1d: Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-dev
* commit '
d6dfeaaa4eeb2d50bc7eb829a488115aedf5a892':
Define FLAG_BEACON in android.media.AudioAttributes
Jae Seo [Sun, 10 Aug 2014 17:43:56 +0000 (17:43 +0000)]
am
44a3a39c: Merge "TIF: Move watch history logging to TvProvider" into lmp-dev
* commit '
44a3a39c39b57fe9988bdbfd3472dfe5818571f5':
TIF: Move watch history logging to TvProvider
Jean-Michel Trivi [Sun, 10 Aug 2014 17:36:30 +0000 (17:36 +0000)]
am
0939dd1d: Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-dev
* commit '
0939dd1db67885d1e6dbc1b70970f2f31bf82805':
Define FLAG_BEACON in android.media.AudioAttributes
Chulwoo Lee [Sun, 10 Aug 2014 08:59:59 +0000 (08:59 +0000)]
am
d71cf6fc: am
516fb60d: Merge "TIF: Fix a bug of incorrect watch history" into lmp-dev
* commit '
d71cf6fcc474ad8f578e94fa42c37e3996a8a233':
TIF: Fix a bug of incorrect watch history
Sailesh Nepal [Sun, 10 Aug 2014 08:59:55 +0000 (08:59 +0000)]
am
1afffbbe: am
375be76e: Merge "Use thread safe set for RemoteConnection.mListeners" into lmp-dev
* commit '
1afffbbe97d58a3c5aa2168d69ec5363a85d766e':
Use thread safe set for RemoteConnection.mListeners
Tyler Gunn [Sun, 10 Aug 2014 08:59:50 +0000 (08:59 +0000)]
am
a75300ec: am
d9593758: Merge "Adding camera failure/ready session events." into lmp-dev
* commit '
a75300ecc56b0e8659d3d3d04acc74b3e49aa032':
Adding camera failure/ready session events.
Chulwoo Lee [Sun, 10 Aug 2014 08:16:46 +0000 (08:16 +0000)]
am
516fb60d: Merge "TIF: Fix a bug of incorrect watch history" into lmp-dev
* commit '
516fb60d3c0bad7262f3ff83c0185e752377b393':
TIF: Fix a bug of incorrect watch history
Sailesh Nepal [Sun, 10 Aug 2014 08:16:31 +0000 (08:16 +0000)]
am
375be76e: Merge "Use thread safe set for RemoteConnection.mListeners" into lmp-dev
* commit '
375be76e3b6df46a7a680bcca9b6eb6e9b1aa59c':
Use thread safe set for RemoteConnection.mListeners
Tyler Gunn [Sun, 10 Aug 2014 08:16:25 +0000 (08:16 +0000)]
am
d9593758: Merge "Adding camera failure/ready session events." into lmp-dev
* commit '
d9593758c3290fe8e08f201a75f88d0e8310d90f':
Adding camera failure/ready session events.
Barnaby James [Sat, 9 Aug 2014 21:10:14 +0000 (14:10 -0700)]
Make Test Voice Interactor support new requirements.
Add settings activity and stub RecognizerService to voice interactor test.
Change-Id: I3c3dda7d2c30eac5e0b889c0c7305dc8f4dfbcb9
Dianne Hackborn [Sat, 9 Aug 2014 20:40:54 +0000 (20:40 +0000)]
am
01e26f94: am
47df503b: Fix issues
16739817 and
16709247 in voice interaction service.
* commit '
01e26f94754c00d5185aeb32c663cf89ce74be0e':
Fix issues
16739817 and
16709247 in voice interaction service.
Dianne Hackborn [Sat, 9 Aug 2014 20:37:01 +0000 (20:37 +0000)]
am
47df503b: Fix issues
16739817 and
16709247 in voice interaction service.
* commit '
47df503b6968e10e1510fb9db808831f23437c16':
Fix issues
16739817 and
16709247 in voice interaction service.
Dianne Hackborn [Sat, 9 Aug 2014 00:35:50 +0000 (17:35 -0700)]
Fix issues
16739817 and
16709247 in voice interaction service.
Issue #
16739817 VIS doesn't start for non-primary user(s)
Issue #
16709247 GSA is not the default voice interaction agent
These are both fixed by getting rid of the existing code for applying
the default voice recognizer, moving it in to the voice interaction
manager service, and extending it to also set up the default voice
interaction service.
Change-Id: If8d5936c28aebfa7eff77c8d99241c3a2ffdb0a4
Barnaby James [Sat, 9 Aug 2014 20:05:49 +0000 (20:05 +0000)]
am
f6a549d1: am
180152af: Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev
* commit '
f6a549d19a03b3c354b906c1b4e9cb54b0bd92d9':
Remove constants for VOICE_CONTROL_ZEN_MODE.
Barnaby James [Sat, 9 Aug 2014 20:01:31 +0000 (20:01 +0000)]
am
180152af: Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev
* commit '
180152af684c214db2fd1f1527c88be1f2c7657e':
Remove constants for VOICE_CONTROL_ZEN_MODE.
John Spurlock [Sat, 9 Aug 2014 18:49:46 +0000 (18:49 +0000)]
am
e9367567: am
ff5faba3: Merge "Doze: Pulse once when a pickup gesture is received." into lmp-dev
* commit '
e93675677b9f0e5b28d1c7de5b805e558833f752':
Doze: Pulse once when a pickup gesture is received.
John Spurlock [Sat, 9 Aug 2014 18:45:19 +0000 (18:45 +0000)]
am
ff5faba3: Merge "Doze: Pulse once when a pickup gesture is received." into lmp-dev
* commit '
ff5faba3745824984fa1a979f5bdd77a3ec61ca2':
Doze: Pulse once when a pickup gesture is received.
Jay Shrauner [Sat, 9 Aug 2014 16:43:12 +0000 (16:43 +0000)]
am
521d9cb0: am
88e7f3c4: Merge "Use thread safe set for adapter set" into lmp-dev
* commit '
521d9cb07f5560723fae426080d36a48cff56919':
Use thread safe set for adapter set
Jay Shrauner [Sat, 9 Aug 2014 16:38:46 +0000 (16:38 +0000)]
am
88e7f3c4: Merge "Use thread safe set for adapter set" into lmp-dev
* commit '
88e7f3c48d6110281c476a36829f2940cd418449':
Use thread safe set for adapter set
John Spurlock [Sat, 9 Aug 2014 15:24:59 +0000 (15:24 +0000)]
am
b47e5650: am
93598a4f: SysUI: Null check around ranking map in isAmbient call.
* commit '
b47e56507f863989c98d27805ec66105b2bd00ad':
SysUI: Null check around ranking map in isAmbient call.
John Spurlock [Sat, 9 Aug 2014 15:19:02 +0000 (15:19 +0000)]
am
93598a4f: SysUI: Null check around ranking map in isAmbient call.
* commit '
93598a4fafcc1d1aba9838b6b75096c141436452':
SysUI: Null check around ranking map in isAmbient call.
John Spurlock [Sat, 9 Aug 2014 15:10:03 +0000 (11:10 -0400)]
SysUI: Null check around ranking map in isAmbient call.
Bug:
16907252
Change-Id: Id21e089b99c1836ac0bbffd205ba89dc05f07b9a
Rachad [Sat, 9 Aug 2014 05:14:08 +0000 (05:14 +0000)]
am
a6b1d678: am
eca07a16: Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev
* commit '
a6b1d6789fc99d0990383973f9a57570e3028546':
Added Tunneled video playback support to MediaCodec
Rachad [Sat, 9 Aug 2014 05:06:38 +0000 (05:06 +0000)]
am
eca07a16: Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev
* commit '
eca07a163ac37e1c72c2e174679068789df977dc':
Added Tunneled video playback support to MediaCodec
Adam Lesinski [Sat, 9 Aug 2014 03:30:19 +0000 (03:30 +0000)]
am
8677fbb2: am
96dc0629: Merge "AAPT support for feature splits" into lmp-dev
* commit '
8677fbb29473babc0c6942163b8a796450f4f33b':
AAPT support for feature splits