Vladislav Kuzkokov
dd6230d466
Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev
2016-09-22 17:09:06 +00:00
Scott Main
ba9db4b110
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
...
am: 8b05feb5b4
2016-09-22 16:57:45 +00:00
Adarsh Fernando
aff6881d04
Removing a temporary redirect for /ndk/guides/cmake.html
...
am: dafcbfa693
2016-09-22 16:57:42 +00:00
TreeHugger Robot
03779f227a
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
2016-09-22 16:57:17 +00:00
Ajay Panicker
45c45d359e
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours am: bc12dda3a7 am: ffe6090f7e am: a71d1c416b am: 081bea189d -s ours
...
am: 34b14060c1
2016-09-22 16:38:14 +00:00
Jaewan Kim
08ca31273c
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf am: 8cb7a9fdb0 am: a13096f4c5 -s ours
...
am: 36aa253b2b
2016-09-22 16:37:06 +00:00
Jaewan Kim
9b790e27b7
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5 am: 9632afe809 -s ours
...
am: b96d410537
2016-09-22 16:35:42 +00:00
Jaewan Kim
83ded12e86
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06 -s ours am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81 am: b6d6519e34 -s ours
...
am: 61fda61d20
2016-09-22 16:34:39 +00:00
Jaewan Kim
53adfd6294
DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993 am: 1adff2ee05 -s ours
...
am: 78efad6418
2016-09-22 16:33:47 +00:00
Ajay Panicker
b809b1f8aa
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b am: 630d577349 am: c9830d56e5 -s ours
...
am: c5442c263a
2016-09-22 16:32:31 +00:00
Ajay Panicker
6ffdf43ec3
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322 -s ours
...
am: b2a1dcb913
2016-09-22 16:31:34 +00:00
Ajay Panicker
d91f2f4d2b
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours
...
am: 745254f98b
2016-09-22 16:30:28 +00:00
Ajay Panicker
8e3293e81f
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470 am: 1783182332 am: 993015ce9a am: 8e172c638d -s ours am: 9338ffa148
...
am: 7e78a89923
2016-09-22 16:08:32 +00:00
Jaewan Kim
bed7636243
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours
...
am: 1c278e5652
2016-09-22 16:06:27 +00:00
Wale Ogunwale
03f7e9e944
Immediately deliver new intent to paused activities.
...
ag/1437028 tried to fix this problem, but limited intent
delivery to only paused activities in a minimized docked stack
to reduce the effect of the change since we are late in the
release cycle. However, it didn't completely solve the problem
for example when the ChooserActivity comes up in the fullscreen
stack un-minimizing the docked stack and then the user selects
the app in the docked stack from ChooserActivity.
We now immediately deliver intents to paused activities as they
are currently visible to the user and we want the user to see
the visual effects caused by the intent delivery now.
Bug: 31371093
Change-Id: I94f9717da66daa512071bb96e62b2f9811691a78
2016-09-22 09:04:09 -07:00
Scott Main
8b05feb5b4
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
2016-09-22 15:22:40 +00:00
Alan Viverette
8817aa9339
Allow developer to override Material-style modes in picker dialogs
...
A recent fix prevented developers from specifying Holo-style mode when
displaying a date or time picker dialog. This CL also cleans up unused
code in TimePickerDialog and documents how themeResId will be used.
Adds hidden @TestApi methods for use in CTS tests. These may be made
public later, but it's too late in MR1 for API changes.
Bug: 31586821
Test: Ice2e203983769f1ea1cfa93105eb97b6fa5176b9
Change-Id: I1b7512b7647ddd7ab987beac2c0aef4fe7cc16bc
2016-09-22 11:16:22 -04:00
Ajay Panicker
34b14060c1
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours am: bc12dda3a7 am: ffe6090f7e am: a71d1c416b
...
am: 081bea189d
2016-09-22 14:48:37 +00:00
Wale Ogunwale
b5066fe307
Save activity state before stopping acitivity when device sleeps
...
Makes it consistent with the regular stop code path and allows
for the activity to be relaunched with the right state if a
relaunch happens after stop due to sleep.
Bug: 30241363
Change-Id: I92edfe6e0e3f5c7ce3b56d49df31e601a798cd4f
2016-09-22 07:32:40 -07:00
Ajay Panicker
7e78a89923
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470 am: 1783182332 am: 993015ce9a am: 8e172c638d -s ours
...
am: 9338ffa148
2016-09-22 14:24:38 +00:00
Jaewan Kim
ca887d4372
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102 am: 5decf8e715 -s ours am: 963c269ffa
...
am: c56cabef9d
2016-09-22 14:24:35 +00:00
Jaewan Kim
900d1c90b3
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours
...
am: fa9983ec73
2016-09-22 14:23:38 +00:00
Ajay Panicker
081bea189d
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours am: bc12dda3a7 am: ffe6090f7e
...
am: a71d1c416b
2016-09-22 14:22:50 +00:00
Hugo Benichi
00a42d4c88
IpConnectivityLog uses new metrics service
...
This patch connects existing IpConnectivityLog to the new
IpConnectivityMetrics service:
- IpConnectivityLog is now an independent class that pushes events
directly to the new IpConnectivityMetrics service.
- DnsEventListenerService is moved from MetricsLoggerService to
IpConnectivityMetrics.
- this patch also features end to end tests from IpConnectivityLog to
IpConnectivityMetrics dumpsys output.
Bug: 31254800
Change-Id: I4fe4a209eedde2814d5f13c574a1a0d854bd05c9
2016-09-22 23:08:37 +09:00
Jaewan Kim
1c278e5652
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490
...
am: 6ad7c0f6ce
2016-09-22 13:58:30 +00:00
Jaewan Kim
c56cabef9d
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102 am: 5decf8e715 -s ours
...
am: 963c269ffa
2016-09-22 13:57:14 +00:00
Ajay Panicker
afeaced48f
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c -s ours
...
am: 0029d03c0a
2016-09-22 13:33:07 +00:00
Ajay Panicker
a71d1c416b
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours am: bc12dda3a7
...
am: ffe6090f7e
2016-09-22 13:32:52 +00:00
Jaewan Kim
fa9983ec73
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb
...
am: 7ffaaca237
2016-09-22 13:31:57 +00:00
Hugo Benichi
eab511b582
New IpConnectivityMetrics service
...
This patch defines a new metrics service for IpConnectivity events
defined in android.net.metrics, separate from currently existing
MetricsLoggerService.
Similarly to MetricsLoggerService, the new service has an event buffer.
It also implements a dumpsys interface that can be used to flush events
and output a serialized proto.
Bug: 31254800
Change-Id: I0c3faeb4008b283f85d9ba9460371fa68956ea3b
2016-09-22 22:25:27 +09:00
Hugo Benichi
50a84c6210
Add ipconnectivity.proto to services jar
...
This patch moves ipconnectivity.proto and companion serialization
classes from /vendor/google/app/ConnectivityMetrics into the framework
services jar.
This will allow to implement a dumpsys interface for IpConnectivity
metrics events defined in android.net.metrics that output metrics as
a serialized proto.
Bug: 31254800
Change-Id: Ia4449103fd7222c9d899352fea2dce47a790a49c
2016-09-22 22:21:41 +09:00
Hugo Benichi
b1af5e51c5
ConnectivityMetricsLoggerTest
...
This patch transforms the IpConnectivityLogTest to test instead the base
class ConnectivityMetricsLogger.
The current test will not be relevant anymore after b/31254800 is
resolved.
Bug: 31254800
Change-Id: I8dc3374450e5f1f87ab1e6f372ad2d2beb25dc48
2016-09-22 22:21:41 +09:00
Jaewan Kim
6ad7c0f6ce
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486
...
am: 1bf809c490
2016-09-22 13:10:13 +00:00
Jaewan Kim
1bf809c490
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours
...
am: 890f53a486
2016-09-22 12:29:19 +00:00
Ajay Panicker
0029d03c0a
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b
...
am: 08fed21f2c
2016-09-22 12:28:51 +00:00
Jaewan Kim
245e33a0b1
DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours am: 2ccdbce954
...
am: 091681149b
2016-09-22 12:26:49 +00:00
Ajay Panicker
ffe6090f7e
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours
...
am: bc12dda3a7
2016-09-22 11:58:28 +00:00
Jaewan Kim
36aa253b2b
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf am: 8cb7a9fdb0
...
am: a13096f4c5
2016-09-22 11:22:51 +00:00
Jaewan Kim
7ffaaca237
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea
...
am: 7eaeeb49bb
2016-09-22 11:21:01 +00:00
Jaewan Kim
b96d410537
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5
...
am: 9632afe809
2016-09-22 10:59:39 +00:00
Jaewan Kim
61fda61d20
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06 -s ours am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81
...
am: b6d6519e34
2016-09-22 10:58:44 +00:00
Jaewan Kim
78efad6418
DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993
...
am: 1adff2ee05
2016-09-22 10:57:53 +00:00
Ajay Panicker
c5442c263a
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b am: 630d577349
...
am: c9830d56e5
2016-09-22 10:56:50 +00:00
Ajay Panicker
b2a1dcb913
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708
...
am: 90eafb5322
2016-09-22 10:55:43 +00:00
Ajay Panicker
745254f98b
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1
...
am: 05cd9942d9
2016-09-22 10:54:53 +00:00
Ajay Panicker
9338ffa148
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470 am: 1783182332 am: 993015ce9a
...
am: 8e172c638d
2016-09-22 10:53:39 +00:00
Jaewan Kim
963c269ffa
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102
...
am: 5decf8e715
2016-09-22 10:52:37 +00:00
Jaewan Kim
a13096f4c5
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf
...
am: 8cb7a9fdb0
2016-09-22 10:52:34 +00:00
Jaewan Kim
091681149b
DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours
...
am: 2ccdbce954
2016-09-22 10:50:05 +00:00
Bill Yi
b1056852a5
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
...
am: 994ec6a0ec
2016-09-22 10:23:07 +00:00
