Tim Kilbourn
5dac28f59d
am c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
...
* commit 'c2b8df82d701eb3508da06f75b2201c3f9796373':
FEATURE_LEANBACK implies that the device is a tv.
2014-03-15 00:24:44 +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
9539b4a02f
Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
2014-03-14 23:13:45 +00:00
Mike Lockwood
9428eb82c0
am c5353ce3: am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
...
* commit 'c5353ce373f02b549ed9e63aa23f94ca1a726f7e':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
2014-03-14 21:54:13 +00:00
Mike Lockwood
685831bf8d
am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
...
* commit 'f9b90434ef04b509c7dcb868d50aa53a66b97809':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
2014-03-14 21:47:37 +00:00
Mike Lockwood
f9b90434ef
am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
...
* commit 'ff64f5ed7c2b55878d149d546092e029cba15465':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
2014-03-14 21:42:58 +00:00
Craig Mautner
d00f47402c
Launch new tasks with Doc Centric flag.
...
Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.
Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795
2014-03-14 14:42:23 -07: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
09d47bbb43
am c2d934d7: am f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"
...
* commit 'c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460':
remove unnecessary switchUser call
2014-03-14 18:01:38 +00: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
Dianne Hackborn
c9519fcd38
am 32a9180a: am f29a4981: 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 '32a9180a6c1ac12503aaf0d123c2bfff73349508':
Fix issue #11965706 : Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-14 17:53:30 +00:00
Victoria Lease
4cde773435
Merge "remove unnecessary switchUser call"
2014-03-14 17:48:01 +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
6b2b14028d
am cb1254f1: am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"
...
* commit 'cb1254f1abc44b82e2a9da0d9a73230eb46e129e':
NsdService does not clean up after exiting clients
2014-03-14 13:13:38 +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
Mike Lockwood
381374b3cd
Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
2014-03-13 23:32:17 +00:00
Dave Platt
f31760c634
NsdService does not clean up after exiting clients
...
When a client of the NsdService exits, NsdService should
clean up the requests it has sent to the mDNS daemon:
cancel any pending resource-discovery and resource-resolution
queries, and remove any services registered by this client.
If this isn't done, several bad things happen. The daemon will
continue to run unnecessarily, will report service discoveries
that can't be forwarded on to the client, and will continue to
advertise service ports for an application which is no longer
running until the device is rebooted (mDNS pollution).
Bug: 9801184
Change-Id: I0aa7311480322aefcff16f902fbbf34f50985d38
2014-03-13 23:16:30 +00:00
John Spurlock
57392e14cd
Merge "Add more information to existing notification_* events."
2014-03-13 21:26:35 +00:00
JP Abgrall
7baa7c8045
Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
2014-03-13 20:33:44 +00: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
John Spurlock
e6a7d93420
Add more information to existing notification_* events.
...
Include calling UID/PID in the existing
notification_{enqueue/cancel/cancel_all} event logs.
Include a new "reason" arg for cancel + cancel_all to
identify listener vs noman vs statusbarmgr calls.
Found and fixed a cancelAll path (from statusbarmgr)
that was not logging at all.
Bug:13442201
Change-Id: I2e1f875076a96b1fe3b86e8990641efb1cadfcfb
2014-03-13 14:18:18 -04:00
Chad Brubaker
8e240af51d
Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
2014-03-13 18:09:58 +00:00
Craig Mautner
aea74a5977
Add Lock Task Mode.
...
When in lock task mode only the specified task may run. All
attempts to switch to another task are ignored until the task
finishes or a call to stopLockTaskMode() is made.
Change-Id: I6cfe92fe1bcf22cd47b5398c08e23c52a4092dda
2014-03-13 11:09:13 -07:00
Christopher Tate
d5b25cbd57
am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
...
* commit 'aaaeb6a21bb6cc540fefa6868493bda612a63f22':
DO NOT MERGE - Don't hang installs if the transport disappears
2014-03-13 18:02:45 +00:00
Mike Lockwood
1cb98aeaad
Merge "USB: Add support for disabling USB permission dialogs."
2014-03-13 17:58:33 +00:00
Mike Lockwood
e97b62ed0d
USB: Add support for disabling USB permission dialogs.
...
Setting scom.android.internal.R.bool.config_disableUsbPermissionDialogs to true
will disable all USB permission dialogs, allowing apps access to USB devices
and accessories by default.
For prototyping purposes only. This should not be used in real devices.
Bug: 13437578
Change-Id: Ie7bf83882943930b15e5f1edb3044a4a52034273
2014-03-13 10:26:53 -07:00
Christopher Tate
aaaeb6a21b
am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
...
* commit '87503f8561296fea489f8a3fe8384f61150976da':
DO NOT MERGE - Don't hang installs if the transport disappears
2014-03-13 17:19:17 +00:00
Dianne Hackborn
08fc3a7fc2
Merge "Fix some uid issues in battery stats."
2014-03-13 17:04:54 +00:00
Dianne Hackborn
bbb7472b8e
Fix some uid issues in battery stats.
...
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
2014-03-13 09:50:24 -07:00
Kenny Guy
4979ff9f28
Merge "Show notifications from related users."
2014-03-13 11:57:55 +00:00
Alexandra Gherghina
aaebbbff73
Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps."
2014-03-13 09:31:53 +00:00
Alexandra Gherghina
dae57a1414
Check for empty activity stack. This avoids a null pointer exception
...
when switching from an user with no open apps.
Change-Id: I02629818f2bc82ee3a2825cf484ef1e32e3e6067
2014-03-13 08:55:56 +00:00
JP Abgrall
3f7f3221df
ConnectivityService: add support to set TCP initial rwnd
...
The value for the TCP initial receive window comes from,
in order,
kernel
/proc/sys/net/ipv4/tcp_default_init_rwnd
init.rc (via properties)
net.tcp.default_init_rwnd
properties
net.tcp.default_init_rwnd
gservices
Settings.Global.TCP_DEFAULT_INIT_RWND
Bug: 12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
2014-03-12 20:22:47 -07:00
Dianne Hackborn
a796168da0
Merge "Fix issue #11965706 : Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
2014-03-13 01:12:13 +00:00
Jianzheng Zhou
d5c69462c6
remove unnecessary switchUser call
...
If userId doesn't change, no need to do switchuser.or it will
introduce some tweak for gps modules in quick off/on because
they need cost time in off/on.
Change-Id: Ie5e408dc8be69c8a63a18bcb2cfe478cef4d70e6
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2014-03-13 09:09:22 +08:00
Jeff Brown
088a997def
am 81cc19cf: am 236e174a: am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
...
* commit '81cc19cf18dff969319c7d1ded4f285394e37aab':
Add a temporary hack to report screen on while dozing.
2014-03-12 22:57:52 +00:00
RoboErik
4224e83642
Merge "Adds a TransportController and TransportPerformer to session"
2014-03-12 22:14:50 +00:00
RoboErik
8ae0f34db9
Adds a TransportController and TransportPerformer to session
...
This makes transport controls a primitive interface on sessions with
a way to create the performer, register callbacks, and send commands
and updates between controllers and performers. This still needs some
cleanup but has been tested with OneMedia.
Change-Id: I373d35f7ccc383b8421bd14044457467d80425f3
2014-03-12 15:09:42 -07: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
Jeff Brown
141d889166
am 578e1938: am 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.
...
* commit '578e19381c2329511187083045d3ad5509428730':
Fix power manager display wake lock bugs.
2014-03-12 20:34:48 +00:00