Android Build Merger (Role)
b152876f2d
Merge "Only persist last Shared Preferences state am: 31d6889f4c" into nyc-mr2-dev-plus-aosp
2016-12-14 18:22:48 +00:00
Philip P. Moltmann
2f1bb85277
Only persist last Shared Preferences state
...
am: 31d6889f4c
2016-12-14 18:21:33 +00:00
Julius D'souza
d8a6e8eaa2
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours
...
am: 323f2dbc46
2016-12-14 18:21:23 +00:00
Julius D'souza
323f2dbc46
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours
...
am: c2aed112a7
2016-12-14 18:15:28 +00:00
Julius D'souza
c2aed112a7
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours
...
am: 03c946e06b
2016-12-14 18:09:25 +00:00
Julius D'souza
03c946e06b
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours
...
am: 10a9005003
2016-12-14 18:03:26 +00:00
Julius D'souza
10a9005003
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours
...
am: 495aa09cc6
2016-12-14 17:56:53 +00:00
Julius D'souza
495aa09cc6
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours
...
am: 589f83e686
2016-12-14 17:51:28 +00:00
Julius D'souza
589f83e686
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle.
...
am: f9f39cc4a8
2016-12-14 17:44:27 +00:00
Marco Nelissen
10cb330d3e
Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed
...
am: 8b1eed4ee8
2016-12-14 17:12:59 +00:00
Marco Nelissen
8b1eed4ee8
Merge "Revert "Remove AmrInputStream"" am: e2d8581529
...
am: 01cb199bed
2016-12-14 17:05:59 +00:00
Marco Nelissen
01cb199bed
Merge "Revert "Remove AmrInputStream""
...
am: e2d8581529
2016-12-14 16:59:23 +00:00
Marco Nelissen
e2d8581529
Merge "Revert "Remove AmrInputStream""
2016-12-14 16:44:47 +00:00
Marco Nelissen
a4efbf863b
Revert "Remove AmrInputStream"
...
This reverts commit 0c3518cc77
2016-12-14 16:44:12 +00:00
Paul Duffin
44da75ebc3
Merge "Copy core-junit files into legacy-test." am: 69e363f506 am: 884d3ca53b
...
am: b5f056068d
2016-12-14 15:16:51 +00:00
Paul Duffin
e9be5d908d
Copy core-junit files into legacy-test. am: cd7c34d8bf am: 98e609d556
...
am: c3650beee5
2016-12-14 15:15:51 +00:00
Paul Duffin
b5f056068d
Merge "Copy core-junit files into legacy-test." am: 69e363f506
...
am: 884d3ca53b
2016-12-14 15:10:30 +00:00
Paul Duffin
c3650beee5
Copy core-junit files into legacy-test. am: cd7c34d8bf
...
am: 98e609d556
2016-12-14 15:09:22 +00:00
Paul Duffin
884d3ca53b
Merge "Copy core-junit files into legacy-test."
...
am: 69e363f506
2016-12-14 15:02:20 +00:00
Paul Duffin
98e609d556
Copy core-junit files into legacy-test.
...
am: cd7c34d8bf
2016-12-14 15:02:16 +00:00
Paul Duffin
69e363f506
Merge "Copy core-junit files into legacy-test."
2016-12-14 14:50:55 +00:00
Paul Duffin
cd7c34d8bf
Copy core-junit files into legacy-test.
...
The legacy-test directory contains part of the Android API and
so must maintain backwards compatibility. The junit classes that
are in the API are copied here to ensure that they do not change
when external/junit is upgraded.
Bug: 30188076
Test: make checkbuild and checked legacy-test contents
Change-Id: I6c263afc16c06abfd027334be51a41422239a189
2016-12-14 14:19:08 +00:00
Paul Duffin
61a967a3f0
Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7 am: 5d53a925a1
...
am: 49a848e46f
2016-12-14 13:47:09 +00:00
Paul Duffin
50c1bb82b1
Copy junit-runner files into test-runner. am: eef35dd29a am: b46cecb6c4
...
am: b6421ce031
2016-12-14 13:43:45 +00:00
Paul Duffin
49a848e46f
Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7
...
am: 5d53a925a1
2016-12-14 13:40:03 +00:00
Paul Duffin
b6421ce031
Copy junit-runner files into test-runner. am: eef35dd29a
...
am: b46cecb6c4
2016-12-14 13:36:38 +00:00
Paul Duffin
5d53a925a1
Merge "Copy junit-runner files into test-runner."
...
am: 3e24af3eb7
2016-12-14 13:35:44 +00:00
Paul Duffin
b46cecb6c4
Copy junit-runner files into test-runner.
...
am: eef35dd29a
2016-12-14 13:30:03 +00:00
Paul Duffin
3e24af3eb7
Merge "Copy junit-runner files into test-runner."
2016-12-14 13:22:40 +00:00
Erik Kline
208336e710
Merge "More correct startup and shutdown procedures." into nyc-mr2-dev
...
am: c8059fb94c
2016-12-14 11:39:44 +00:00
Erik Kline
20cad0821d
More correct startup and shutdown procedures.
...
am: 6c0782f1ae
2016-12-14 11:39:36 +00:00
TreeHugger Robot
c8059fb94c
Merge "More correct startup and shutdown procedures." into nyc-mr2-dev
2016-12-14 11:33:38 +00:00
Michal Karpinski
25946b8d69
Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev
...
am: d9eb4fce7d
2016-12-14 10:58:32 +00:00
Michal Karpinski
ea792a7c11
DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
...
am: e3639a0a07
2016-12-14 10:58:22 +00:00
Michal Karpinski
306b268fb7
DO NOT MERGE Fix Lint errors for network logging API
...
am: 0c4ec00f85
2016-12-14 10:57:26 +00:00
Michal Karpinski
4c7693e121
DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
...
am: c4e7c32063
2016-12-14 10:56:34 +00:00
Michal Karpinski
8cfca9dbfe
DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users
...
am: 504fa62f9e
2016-12-14 10:55:45 +00:00
Michal Karpinski
a507f28143
DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
...
am: 5c64223da4
2016-12-14 10:54:55 +00:00
Michal Karpinski
eaaf9a1213
DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
...
am: 896b9db8ed
2016-12-14 10:53:30 +00:00
Michal Karpinski
fd4ec31313
DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times
...
am: bbf352a2c1
2016-12-14 10:52:18 +00:00
Michal Karpinski
d1c710d5cf
DO NOT MERGE [DPM] Management and retrieval of network logs
...
am: 4c47adef60
2016-12-14 10:51:33 +00:00
Michal Karpinski
b2e8690507
DO NOT MERGE [DPM] DO can start network logging and listen for events
...
am: c3abd34cfe
2016-12-14 10:50:36 +00:00
Michal Karpinski
d9eb4fce7d
Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev
...
* changes:
DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
DO NOT MERGE Fix Lint errors for network logging API
DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users
DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times
DO NOT MERGE [DPM] Management and retrieval of network logs
DO NOT MERGE [DPM] DO can start network logging and listen for events
2016-12-14 10:44:23 +00:00
Paul Duffin
eef35dd29a
Copy junit-runner files into test-runner.
...
The android.test.runner target forms part of the Android API and
so must maintain backwards compatibility. The junit classes that
belong in there are copied here to ensure that they do not
change when external/junit is upgraded.
Bug: 30188076
Test: make checkbuild and checked android.test.runner contents
Change-Id: I947144c47ae1c3eb361a43c39bdd03dc11b9575f
2016-12-14 10:41:05 +00:00
Erik Kline
6c0782f1ae
More correct startup and shutdown procedures.
...
During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.
During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.
Bug: 33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710
2016-12-14 18:53:26 +09:00
Ruben Brunk
7efe982f0f
Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev
...
am: 3661a6f91b
2016-12-14 08:28:08 +00:00
Ruben Brunk
1244608172
Fix VR interaction with screen on/off/lockscreen.
...
am: 040484cf90
2016-12-14 08:27:58 +00:00
TreeHugger Robot
3661a6f91b
Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev
2016-12-14 08:22:33 +00:00
Erik Kline
ee39ac1ceb
Merge "Stop setting net.hostname" am: 06178a39f8 am: 35cc49e03f
...
am: da70b6b287
2016-12-14 08:13:30 +00:00
Erik Kline
da70b6b287
Merge "Stop setting net.hostname" am: 06178a39f8
...
am: 35cc49e03f
2016-12-14 08:07:01 +00:00
