Guang Zhu
087270db7e
am e48b12c4: am 5115b590: Merge "disable flashlight for monkey tests" into lmp-dev
...
* commit 'e48b12c4c377cfcaebf603f2620349f1e681bcab':
disable flashlight for monkey tests
2014-07-30 16:43:02 +00:00
Youngsang Cho
0e3b02b70e
am c37397b9: am e2a60df1: Merge "TIF: Add a system api TvInputInfo.isCecDeviceConnectedToSwitch" into lmp-dev
...
* commit 'c37397b9019d1a531f9ee8de0db5d12e2aa459ff':
TIF: Add a system api TvInputInfo.isCecDeviceConnectedToSwitch
2014-07-30 16:42:57 +00:00
Jae Seo
7a869cb61e
am 4c61c0a4: am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager
...
* commit '4c61c0a4e81cf01154ee94c4c30106ad41d637f9':
TIF: Merge TvParentalControlManager into TvInputManager
2014-07-30 16:42:53 +00:00
Jae Seo
d5d2893e44
am f38c8185: am af0f27fa: TIF: Use more consistent constant names
...
* commit 'f38c81859b8015339b7c72fea088da5810cedefc':
TIF: Use more consistent constant names
2014-07-30 16:42:40 +00:00
Alan Viverette
351328416f
am 81250206: am 719cc772: Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev
...
* commit '81250206a84e8f34eee6b121e3f1a57cd1875b71':
Revert "Update switch assets, fix SearchView asset 9-patch areas"
2014-07-30 16:42:30 +00:00
Wonsik Kim
0e77c3e64e
am af1ea61c: am d284bd57: TIF: ensure hardware / CEC event calling sequence
...
* commit 'af1ea61c57de2685b4fa4b9237cf036c3b9f96be':
TIF: ensure hardware / CEC event calling sequence
2014-07-30 16:42:23 +00:00
Alan Viverette
2dedbc912d
am b1d563b1: am cabeac83: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
...
* commit 'b1d563b142b14a1b439fc96fd8f6b26fc4fdc262':
Update switch assets, fix SearchView asset 9-patch areas
2014-07-30 16:41:59 +00:00
Dirk Dougherty
7fd639f22e
am d593f43a: am 33bf37c6: am 78ad92b4: am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade.
...
* commit 'd593f43a749afe4016d429cbe67219630b7e02be':
Doc change: add notice for admob sdk upgrade.
2014-07-30 16:40:14 +00:00
Aravind Akella
9be5ef8dba
am 05f855b4: am 1fde001f: Merge "SensorManager API changes." into lmp-dev
...
* commit '05f855b44c5a5f53f4a8416bfd5399493b570023':
SensorManager API changes.
2014-07-30 16:40:08 +00:00
Alan Viverette
65de1521af
am d34d495f: am de583846: Merge "Enable hardware rendering for system process" into lmp-dev
...
* commit 'd34d495f367e84b8a3e78eaa4acbfe3c4902a1f8':
Enable hardware rendering for system process
2014-07-30 16:40:04 +00:00
Jeff Sharkey
f9cc03e06b
am a3a9bf36: am 0be65699: Light icons for DocumentsUI.
...
* commit 'a3a9bf36191a51c02172167246fa8aebf172e5c5':
Light icons for DocumentsUI.
2014-07-30 16:39:57 +00:00
Sandeep Siddhartha
514af2c236
am e444b911: am 5b02e931: Notify VIS of shutdown before switching implementations
...
* commit 'e444b91104d8b9a0d5de63d7523e6aeb5e2a73fa':
Notify VIS of shutdown before switching implementations
2014-07-30 16:39:45 +00:00
Tyler Gunn
727c700603
am edeba32e: am c5d8facb: Adding video width/height to camera capabilities.
...
* commit 'edeba32e40a32fd2a16b05e4797801f8a104bf68':
Adding video width/height to camera capabilities.
2014-07-30 16:39:40 +00:00
Jeff Sharkey
07ca771d87
am 38ba25de: am fa939303: Latest DocumentsUI material asset drop.
...
* commit '38ba25de1a278aa7db57f4ee16e2691b44e98a06':
Latest DocumentsUI material asset drop.
2014-07-30 16:39:36 +00:00
Ye Wen
d6301cc18b
am 1b16479a: am 76f285ee: Merge "Implement broker pattern for imms (1/3)" into lmp-dev
...
* commit '1b16479a79442438747ebbaf674c37f83dbdda8c':
Implement broker pattern for imms (1/3)
2014-07-30 16:39:32 +00:00
Wei Wang
9e2fc3c71f
am 53be8d6a: am e95a450e: Merge "Make scan filter accepts prefix. Add tests." into lmp-dev
...
* commit '53be8d6ae0fad6b274c5aa91a2aa97783964f948':
Make scan filter accepts prefix. Add tests.
2014-07-30 16:39:27 +00:00
Amith Yamasani
5cd4e03465
am 8d072bf2: am e257f1ee: Set profile owner via an intent
...
* commit '8d072bf22740082bc328624d0a7b4c8dbc75936b':
Set profile owner via an intent
2014-07-30 16:39:22 +00:00
Jeff Davidson
1a7d51ea50
am c6ddb55c: am 9f920587: Merge "Don\'t request network scores before boot completes." into lmp-dev
...
* commit 'c6ddb55cdb8af7fb0b626728078828e1d9599158':
Don't request network scores before boot completes.
2014-07-30 16:39:12 +00:00
Amith Yamasani
2623b6972f
am db231902: am 711c40a2: Merge "Potential fix for apps disappearing in launcher on system server crash" into lmp-dev
...
* commit 'db2319027dd17a8c5980732b7b930706d8a8d6c2':
Potential fix for apps disappearing in launcher on system server crash
2014-07-30 16:39:07 +00:00
Eino-Ville Talvala
b565d999cf
am 5496085d: am c02b64b6: Camera2: API review updates
...
* commit '5496085d413b3ea12a2cd6e4531c3f95b41ed86d':
Camera2: API review updates
2014-07-30 16:38:56 +00:00
Ying Wang
f9cf34b9b5
am 1ebafced: am d9789353: Merge "Fix docs build." into lmp-dev
...
* commit '1ebafced52112db8ea77fc7221d74ec4b8547a6c':
Fix docs build.
2014-07-30 16:38:50 +00:00
Craig Mautner
86af0d0245
am 34a2d92a: am 6b3bade6: Eliminate memory leak in TaskPersister
...
* commit '34a2d92a5cef8d5ee2cf7536e5cfccba83850ae7':
Eliminate memory leak in TaskPersister
2014-07-30 16:38:44 +00:00
Jeff Sharkey
24acf815b7
am 7e0e1d01: am c3214d18: More DocumentsUI material iteration.
...
* commit '7e0e1d01476f2a4e6f5451da177846bda41a0607':
More DocumentsUI material iteration.
2014-07-30 16:38:39 +00:00
Jeff Davidson
3b97984410
am bf7b7ee0: am ebc1f37f: Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev
...
* commit 'bf7b7ee09adbd13fc37a8c8d41b53e1bc1158f7c':
Add NetworkScoreManager.disableScoring().
2014-07-30 16:38:19 +00:00
Jinsuk Kim
c9edca0989
am 0c7ef24c: am 8b964025: Invoke input change listener at path change
...
* commit '0c7ef24cf451278caeb3cb9fc97d7752e4393438':
Invoke input change listener at path change
2014-07-30 16:38:15 +00:00
Yuncheol Heo
fd83bb3667
am cd29acf7: am 6fa5476a: Make it pass CECT 11.1.3 System standby
...
* commit 'cd29acf734eeba8237799da1b844edb404efeef0':
Make it pass CECT 11.1.3 System standby
2014-07-30 16:38:10 +00:00
Jinsuk Kim
56d138c2ef
am e129f19b: am 78aaab20: Merge "Send TV app the intent for the new active source" into lmp-dev
...
* commit 'e129f19bae9fdac44b9b6b9bcbf55d180a645188':
Send TV app the intent for the new active source
2014-07-30 14:15:57 +00:00
Ihab Awad
a5b293a79a
am 0b3e8756: am 4290e4eb: Merge "Connection creation and service wiring for WiFi call managers (1/3)" into lmp-dev
...
* commit '0b3e87565008f3a8a58219dc35e0da90a4a86b37':
Connection creation and service wiring for WiFi call managers (1/3)
2014-07-30 14:15:52 +00:00
Igor Murashkin
22a8176d89
am 75b10ee7: am 3387fffa: Merge "camera2: legacy: Don\'t set the @hide frame number metadata" into lmp-dev
...
* commit '75b10ee7e74bea0195ed5190ec6edbaac4a38ae6':
camera2: legacy: Don't set the @hide frame number metadata
2014-07-30 14:15:31 +00:00
Igor Murashkin
3b6c24eec1
am 12b57ce6: am 92f2d610: Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev
...
* commit '12b57ce60bb6b4b50c47f1e091ffdb5d3c205e46':
camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
2014-07-30 14:15:23 +00:00
Jorim Jaggi
88a5fff444
am 522542ed: am 5c2d0ab8: Optimize alpha handling for stack scroller
...
* commit '522542ed7e194b4fced90eb90c520b1bc7dec3d7':
Optimize alpha handling for stack scroller
2014-07-30 14:15:19 +00:00
Igor Murashkin
5abfb08c2b
am 44e5ce82: am 6dc35134: Merge changes I104c8243,I82811142 into lmp-dev
...
* commit '44e5ce8264387f906d360edcd5295b27da54bc11':
camera2: legacy: fix cached results bug and fix focus modes
camera2: legacy: Add focus support
2014-07-30 14:15:07 +00:00
Guang Zhu
c7db5d0b49
am 5115b590: Merge "disable flashlight for monkey tests" into lmp-dev
...
* commit '5115b59079c5638a6fbed63803ba8687ef67a403':
disable flashlight for monkey tests
2014-07-30 13:08:05 +00:00
Youngsang Cho
8e1d0e968a
am e2a60df1: Merge "TIF: Add a system api TvInputInfo.isCecDeviceConnectedToSwitch" into lmp-dev
...
* commit 'e2a60df171632dde1a0b31b86d7c6088fc9c1819':
TIF: Add a system api TvInputInfo.isCecDeviceConnectedToSwitch
2014-07-30 13:08:01 +00:00
Jae Seo
ff87f9a836
am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager
...
* commit 'ec7accc28b47216aaf5a2ee49bf346943af95868':
TIF: Merge TvParentalControlManager into TvInputManager
2014-07-30 13:07:56 +00:00
Jae Seo
783645e99f
TIF: Merge TvParentalControlManager into TvInputManager
...
This change addresses the following API council feedback.
TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
TvInputManager.
== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
loaded at boot by your internal system service. It should _not_ be stored in
a Secure/Global setting.
Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
2014-07-30 15:39:39 +09:00
Jae Seo
31ba6138b7
am af0f27fa: TIF: Use more consistent constant names
...
* commit 'af0f27faa9648fbe4c7cb131ebb2554ab247e3ab':
TIF: Use more consistent constant names
2014-07-30 02:53:20 +00:00
Jae Seo
6e62a1508c
TIF: Use more consistent constant names
...
Change-Id: Iee7cbbba621e4174c9fdaedc86d3830ca9f46cfe
2014-07-30 11:46:41 +09:00
Alan Viverette
a147454ca0
am 719cc772: Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev
...
* commit '719cc7726b2999ff74e8a8b9a562643adea462c0':
Revert "Update switch assets, fix SearchView asset 9-patch areas"
2014-07-30 02:43:36 +00:00
Wonsik Kim
5652ab53cd
am d284bd57: TIF: ensure hardware / CEC event calling sequence
...
* commit 'd284bd574770412042a463bca1c0091e864706ff':
TIF: ensure hardware / CEC event calling sequence
2014-07-30 02:25:38 +00:00
Wonsik Kim
d922a546b9
TIF: ensure hardware / CEC event calling sequence
...
Bug: 16441047
Change-Id: Ie654b78ec91a081a1438cc036967f528e063f25b
2014-07-30 11:19:56 +09:00
Alan Viverette
72061337a0
am cabeac83: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
...
* commit 'cabeac83d842902fbb9827e51cc8591a930d5409':
Update switch assets, fix SearchView asset 9-patch areas
2014-07-30 01:17:25 +00:00
Dirk Dougherty
7409cadbf7
am 33bf37c6: am 78ad92b4: am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade.
...
* commit '33bf37c6970e603969a06c021b7a0a2531a85b37':
Doc change: add notice for admob sdk upgrade.
2014-07-30 01:09:40 +00:00
Aravind Akella
043f8fb58a
am 1fde001f: Merge "SensorManager API changes." into lmp-dev
...
* commit '1fde001ffed1f8bef092d57d5fadbe091684f955':
SensorManager API changes.
2014-07-30 01:09:35 +00:00
Alan Viverette
97547a743f
am de583846: Merge "Enable hardware rendering for system process" into lmp-dev
...
* commit 'de583846c60052e0c4bb6ce92b59c642bd05bb59':
Enable hardware rendering for system process
2014-07-30 01:09:32 +00:00
Jeff Sharkey
36577f82a9
am 0be65699: Light icons for DocumentsUI.
...
* commit '0be6569988a31e0aa879cfea0cd73b5cf7123591':
Light icons for DocumentsUI.
2014-07-30 01:09:27 +00:00
Sandeep Siddhartha
b15fe22a2b
am 5b02e931: Notify VIS of shutdown before switching implementations
...
* commit '5b02e931db0e636743613697ace65b046e8607c0':
Notify VIS of shutdown before switching implementations
2014-07-30 01:09:23 +00:00
Tyler Gunn
f208fbc1b5
am c5d8facb: Adding video width/height to camera capabilities.
...
* commit 'c5d8facbc636f209fdba5bb23f6dccd35aa7316b':
Adding video width/height to camera capabilities.
2014-07-30 01:09:18 +00:00
Jeff Sharkey
ed8847bd46
am fa939303: Latest DocumentsUI material asset drop.
...
* commit 'fa939303c1ada876214a892089cb051cca2e92b9':
Latest DocumentsUI material asset drop.
2014-07-30 01:09:14 +00:00
Ye Wen
3ef4152834
am 76f285ee: Merge "Implement broker pattern for imms (1/3)" into lmp-dev
...
* commit '76f285ee09975612e2c0a678689ce6c36d1bd98d':
Implement broker pattern for imms (1/3)
2014-07-30 01:09:10 +00:00