John Spurlock
e2cae0a657
am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
...
* commit '2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
Unhide Notification kind, rename to category.
2014-03-24 17:44:53 +00:00
John Spurlock
cf44a124ab
Unhide Notification kind, rename to category.
...
Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
2014-03-24 11:02:36 -04:00
Craig Mautner
b98ee1eb50
am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
...
* commit '103ed3558764f1fd41c9a5399e2030baa4110bfb':
Set ScreenshotSurface secure if any secure content is shown.
2014-03-24 14:38:33 +00:00
Jinsuk Kim
3c34e5dbbb
am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
...
* commit 'c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
Add HdmiCecManager
2014-03-24 12:26:51 +00:00
Jinsuk Kim
c01e1aeb0d
Merge "Add HdmiCecManager" into klp-modular-dev
2014-03-23 23:24:44 +00:00
Jinsuk Kim
fbcd503645
Add HdmiCecManager
...
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).
Change-Id: I39da071a328074a4b7b049947943688bd7779c26
2014-03-24 08:19:39 +09:00
Chad Brubaker
05e4dc96fb
am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
...
* commit '850eb678d7356ea60925dc6fa450e213d5cea2d5':
Fix support for simultaneous VPN tuns
2014-03-21 21:09:44 +00:00
Chad Brubaker
9506e84b6f
am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
...
* commit 'c77261471432e1577586395dd0a6a481ef7431b5':
Include the interface for clearDnsInterfaceForUidRange
2014-03-21 21:09:41 +00:00
Chad Brubaker
850eb678d7
am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
...
* commit 'eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
Fix support for simultaneous VPN tuns
2014-03-21 21:02:47 +00:00
Chad Brubaker
c772614714
am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
...
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
Include the interface for clearDnsInterfaceForUidRange
2014-03-21 21:02:43 +00:00
Jinsuk Kim
cfba284ad7
am d73e66cc: Fix broken build
...
* commit 'd73e66cce12f13faec44b12d9e6f33c2f28a2d5a':
Fix broken build
2014-03-21 03:40:08 +00:00
Jinsuk Kim
d73e66cce1
Fix broken build
...
Change-Id: Ia7d207f7937e29cf48dce30d8c5a91f50c9e7d4c
2014-03-21 12:30:59 +09:00
Jinsuk Kim
f2fecf48f7
am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev
...
* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
Add HDMI-CEC service
2014-03-21 02:37:00 +00:00
Jinsuk Kim
c61f4dd744
Merge "Add HDMI-CEC service" into klp-modular-dev
2014-03-21 02:32:38 +00:00
Jim Miller
8c5567ee9e
am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
...
* commit 'bd33dc01f68ae0f4e4861568c02619e38c40af15':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
2014-03-20 16:24:03 +00:00
Jinsuk Kim
4f512fb451
Add HDMI-CEC service
...
This CL adds a system service handling HDMI-CEC protocol. The service
is equipped with the capability sending/receiving HDMI-CEC messages
Not all the messages are in place. Currently it has messages to support
a few features only, as follows:
- One touch play
- System information
- Routing control (partially - active source status maintenance only)
- Device OSD transfer
- Power status
It will be extended to cover the wider usages in the follow up CLs.
The CEC standard version referenced in the implementation is 1.3a.
Change-Id: Ifed0b02f52ebf098eddb3bd0987efbf353b7e8fe
2014-03-20 16:40:22 +09:00
Jim Miller
bd33dc01f6
am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
...
* commit '8e69abf8c62452e6e9bcd254a55a2d80c8ef5b3d':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
2014-03-20 02:47:09 +00:00
Nick Kralevich
0b4f63c319
am dd6b7495: am 83725810: Merge "Get rid of noise during boot."
...
* commit 'dd6b7495577eca7a00aa37bfdca3449cf1443681':
Get rid of noise during boot.
2014-03-20 01:52:42 +00:00
Nick Kralevich
b630ffe3fd
am e75d340a: am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data."
...
* commit 'e75d340ae5919942d19f57856ae9e3f8bc62e098':
Allow PMS to restorecon directories under /data.
2014-03-19 20:24:32 +00:00
Robert Greenwalt
45b1e5ec05
am 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
...
* commit '42b746e4d8baa6141598ddaae7148baea2ddf366':
Handle provisioning APN by turning off/on data.
2014-03-19 19:13:00 +00:00
Robert Greenwalt
42b746e4d8
am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
...
* commit 'bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
Handle provisioning APN by turning off/on data.
2014-03-19 19:08:44 +00:00
Doug Zongker
2e6d960c85
am cdf00888: add option to shutdown after factory reset
...
* commit 'cdf008883921c2eb7daf10c82687e9a36461eb16':
add option to shutdown after factory reset
2014-03-18 20:49:12 +00:00
Doug Zongker
cdf0088839
add option to shutdown after factory reset
...
Add a new hidden method to recovery system to trigger a factory reset
followed by a shutdown, rather than a reboot back to the regular
system. Use this flag when the MASTER_CLEAR intent is broadcast with
a boolean extra "shutdown" set to true.
Change-Id: I2ceb25b715d9f0ef492a75b3d287d1e17cec89ef
2014-03-18 12:52:04 -07:00
Dianne Hackborn
7987d84e35
am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
...
* commit 'd1d91eca3e78f2074b110a0e3530aeff6deef6fe':
Insufficient ProcessRecord cleanup when persistent process is killed
2014-03-18 18:36:53 +00:00
Tim Kilbourn
42dd0bb6b5
am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
...
* commit '9539b4a02f74b447db0e3aa1039229f6b913aa87':
FEATURE_LEANBACK implies that the device is a tv.
2014-03-14 23:33:11 +00:00
Tim Kilbourn
0722968c59
FEATURE_LEANBACK implies that the device is a tv.
...
For managing the ui mode, consider the device to be a television if it
has either the FEATURE_TELEVISION or FEATURE_LEANBACK system features.
When leanback is available for non-television devices, we need to
reconsider the use of these features for setting the television ui mode.
Change-Id: I7b82372ce19067e010be9b42111816bab186f95b
2014-03-14 13:44:12 -07:00
Victoria Lease
f8ce43ea14
am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"
...
* commit '1365d98270e0a0a61d10743820e923aeff974b39':
remove unnecessary switchUser call
2014-03-14 17:54:32 +00:00
JP Abgrall
7238585e2e
am 4f261396: am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
...
* commit '4f26139661b0039cff5e570975e6bf9b0bbce1af':
ConnectivityService: add support to set TCP initial rwnd
2014-03-14 16:32:21 +00:00
Chad Brubaker
4b59883afd
am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
...
* commit '7c2b1625d66d3c80c313160f78c8bccd9499539e':
Remove SO_BINDTODEVICE from VPN protect
2014-03-14 16:32:18 +00:00
Dianne Hackborn
f29a498161
am d4981014: am e5191aab: am a796168d: Merge "Fix issue #11965706 : Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
...
* commit 'd4981014d486c3ff72813d0d37048ee2abdb3d63':
Fix issue #11965706 : Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-14 16:32:02 +00:00
JP Abgrall
4f26139661
am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
...
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
ConnectivityService: add support to set TCP initial rwnd
2014-03-14 16:28:09 +00:00
Chad Brubaker
7c2b1625d6
am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
...
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
Remove SO_BINDTODEVICE from VPN protect
2014-03-14 16:27:58 +00:00
Dianne Hackborn
d4981014d4
am e5191aab: am a796168d: Merge "Fix issue #11965706 : Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
...
* commit 'e5191aabff5b9b751349b8634836a858af744905':
Fix issue #11965706 : Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-14 16:27:40 +00:00
Dave Platt
e4e6b3cc19
am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"
...
* commit '21384faa2b3da619a54b35f15936c00593b30694':
NsdService does not clean up after exiting clients
2014-03-13 23:42:03 +00:00
Brian Carlstrom
00d115a753
resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp
...
Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
2014-03-13 16:35:09 -07:00
Chad Brubaker
48dd8b0fc0
am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
...
* commit '74f99a4e904af56a62f86b81831c23c763b6001e':
Only allow System apps to make VPN exempt routes
2014-03-13 18:23:00 +00:00
Chad Brubaker
7f68f7f4a1
am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
...
* commit 'f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
Add the calling package name to requestRouteToHost
2014-03-13 18:22:57 +00:00
Narayan Kamath
aa737c49df
am 9af19bee: am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.
...
* commit '9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
2014-03-13 18:18:48 +00:00
Chad Brubaker
74f99a4e90
am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
...
* commit '7fb074389370ac93afc5830189371dc3ec26265c':
Only allow System apps to make VPN exempt routes
2014-03-13 18:18:40 +00:00
Chad Brubaker
f5729a6a15
am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
...
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
Add the calling package name to requestRouteToHost
2014-03-13 18:18:36 +00:00
RoboErik
306c46884e
am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge
...
* commit 'ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd':
b/12068020 Make kb layouts only unique to vendor/product. Do not merge
2014-03-12 21:12:26 +00:00
RoboErik
ca9eef6203
b/12068020 Make kb layouts only unique to vendor/product. Do not merge
...
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/
Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.
There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.
Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
2014-03-12 13:21:08 -07:00
Jeff Brown
236e174a96
am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
...
* commit '0575b185c618a79ede771389ed9a78436b5636bd':
Add a temporary hack to report screen on while dozing.
2014-03-12 19:19:12 +00:00
Jeff Brown
0575b185c6
Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
2014-03-12 19:16:42 +00:00
Jeff Brown
3ce589e595
am 2d8a3908: Fix power manager display wake lock bugs.
...
* commit '2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e':
Fix power manager display wake lock bugs.
2014-03-12 08:57:51 +00:00
Jeff Brown
2d8a3908d2
Fix power manager display wake lock bugs.
...
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.
1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.
2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on. This could happen when the display was
rapidly turned on-off-on-off.
Bug: 13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
2014-03-11 23:23:58 -07:00
Jeff Brown
e39ef09896
Add a temporary hack to report screen on while dozing.
...
The window manager and view hierarchy currently disable all drawing
when PowerManager.isScreenOn() returns false so no drawing occurs
while dozing. This will be fixed in a future patch to take the
display blanking state into account correctly.
This patch is a workaround to unblock development in the meantime.
Bug: 13133142
Change-Id: I2dc0b422c77285e657d73adca2606aa68264d987
2014-03-11 20:56:26 -07:00
Robert Greenwalt
ee142967f6
am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
...
* commit 'e5098b502c28d8f40ff3b39070fc5fb7f1a3e445':
DO NOT MERGE Debounce wifi country code Info
2014-03-11 19:19:07 +00:00
Vinit Deshapnde
dbba6f0769
am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
...
* commit '2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
2014-03-11 19:19:02 +00:00
Robert Greenwalt
e5098b502c
am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
...
* commit 'e8af5e10e04697acb26b47e5d60b99e5c61a020c':
DO NOT MERGE Debounce wifi country code Info
2014-03-11 17:44:20 +00:00