OSDN Git Service
Colin Cross [Thu, 15 Dec 2016 07:29:24 +0000 (07:29 +0000)]
Convert libstorage to Android.bp am:
3ac2be93a9 am:
f12ae4bed7
am:
791d02818a
Change-Id: I73bb8a7332a6ba9aebf413cf9f0889ff9d98a5de
Colin Cross [Thu, 15 Dec 2016 07:28:24 +0000 (07:28 +0000)]
Move libstorage includes into frameworks/base/lib/storage am:
e78f853e46 am:
afef87b1ba
am:
f142640afb
Change-Id: I9f084034f960478ee6141158a0a0c5119d1879a4
Colin Cross [Thu, 15 Dec 2016 07:15:32 +0000 (07:15 +0000)]
Convert libstorage to Android.bp am:
3ac2be93a9
am:
f12ae4bed7
Change-Id: I1255ee2b166b73a79b19035d59994204bb268c82
Colin Cross [Thu, 15 Dec 2016 07:14:32 +0000 (07:14 +0000)]
Move libstorage includes into frameworks/base/lib/storage am:
e78f853e46
am:
afef87b1ba
Change-Id: Iff9c41710528af37a788973ac4a1080024808c95
Colin Cross [Thu, 15 Dec 2016 07:00:07 +0000 (07:00 +0000)]
Convert libstorage to Android.bp
am:
3ac2be93a9
Change-Id: Ia1d78149bfedcc7e8959d557ac3a239a77c04924
Colin Cross [Thu, 15 Dec 2016 06:59:18 +0000 (06:59 +0000)]
Move libstorage includes into frameworks/base/lib/storage
am:
e78f853e46
Change-Id: Icac09a62152f11cf7a8d5ce5ffe9011949e17ec0
Erik Kline [Thu, 15 Dec 2016 05:40:17 +0000 (05:40 +0000)]
Merge "More correct startup and shutdown procedures." am:
618d4215a2 am:
b6588f9a41
am:
7074b562d9
Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8
Erik Kline [Thu, 15 Dec 2016 05:32:50 +0000 (05:32 +0000)]
Merge "More correct startup and shutdown procedures." am:
618d4215a2
am:
b6588f9a41
Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae
Erik Kline [Thu, 15 Dec 2016 05:25:48 +0000 (05:25 +0000)]
Merge "More correct startup and shutdown procedures."
am:
618d4215a2
Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
Treehugger Robot [Thu, 15 Dec 2016 05:10:10 +0000 (05:10 +0000)]
Merge "More correct startup and shutdown procedures."
Erik Kline [Mon, 12 Dec 2016 12:21:40 +0000 (21:21 +0900)]
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.
Test: backport from internal
Bug:
33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710
George Burgess IV [Wed, 14 Dec 2016 23:49:07 +0000 (23:49 +0000)]
Merge "Fix a memory leak." am:
1715678a89 am:
8f9c005fa9
am:
85785b557a
Change-Id: I1e05b7d2793797cba915d0debd775b6b09b972cb
George Burgess IV [Wed, 14 Dec 2016 23:41:26 +0000 (23:41 +0000)]
Merge "Fix a memory leak." am:
1715678a89
am:
8f9c005fa9
Change-Id: I29afa8d1394feb57574ed527cda102405571fd65
George Burgess IV [Wed, 14 Dec 2016 23:34:23 +0000 (23:34 +0000)]
Merge "Fix a memory leak."
am:
1715678a89
Change-Id: Ia005c534ef0e62e3efd6f59954cd2850349c7672
Hall Liu [Wed, 14 Dec 2016 23:30:01 +0000 (23:30 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" am:
d11261dcc9 am:
32e98d2f45
am:
60cb82e8e6
Change-Id: I9bfe58895aadcd5c40bae1bfc7a093feee4a6aa2
Jeremy Joslin [Wed, 14 Dec 2016 23:28:56 +0000 (23:28 +0000)]
Merge "Add an IPC for requesting network scores." am:
e89ed4a001 am:
724b26c902
am:
a00fda5311
Change-Id: I5b529ba1f9a151e108229c493cbdc0facd494d30
Marie Janssen [Wed, 14 Dec 2016 23:27:54 +0000 (23:27 +0000)]
resolve merge conflicts of
7a2518e to nyc-mr1-dev-plus-aosp
am:
f2fc15824d
Change-Id: I71d80c8a24f206d5919f56a28b1f1333021b7d46
Treehugger Robot [Wed, 14 Dec 2016 23:23:50 +0000 (23:23 +0000)]
Merge "Fix a memory leak."
Hall Liu [Wed, 14 Dec 2016 23:23:21 +0000 (23:23 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" am:
d11261dcc9
am:
32e98d2f45
Change-Id: I0741edc2b35b7c57cbde338c4617791d1d089137
Jeremy Joslin [Wed, 14 Dec 2016 23:22:15 +0000 (23:22 +0000)]
Merge "Add an IPC for requesting network scores." am:
e89ed4a001
am:
724b26c902
Change-Id: If6284c934cd47257367c614523d4928758ab34e1
Marie Janssen [Wed, 14 Dec 2016 21:44:28 +0000 (13:44 -0800)]
resolve merge conflicts of
7a2518e to nyc-mr1-dev-plus-aosp
Change-Id: I903680717ed121a93fee3b7c2ed358cb29726d71
Colin Cross [Wed, 14 Dec 2016 21:06:07 +0000 (13:06 -0800)]
Convert libstorage to Android.bp
See build/soong/README.md for more information.
Test: m -j native
Change-Id: Ieb34d79af10e4e7cd146d0d40fd6946499dd1da0
Colin Cross [Wed, 14 Dec 2016 21:03:12 +0000 (13:03 -0800)]
Move libstorage includes into frameworks/base/lib/storage
Move the libstorage includes out of the global include path and into
frameworks/base/lib/storage/include, and export it.
Bug:
33630870
Test: m -j native
Change-Id: Idc0735360abc703496b9bc46d1a76ce8039af0d1
Hall Liu [Wed, 14 Dec 2016 20:03:54 +0000 (20:03 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection"
am:
d11261dcc9
Change-Id: I002d1d32e6c0fb69c99047a19ca07f4326ec5323
Jeremy Joslin [Wed, 14 Dec 2016 20:02:45 +0000 (20:02 +0000)]
Merge "Add an IPC for requesting network scores."
am:
e89ed4a001
Change-Id: I23bee3f29d3b3f71da6103e23afafc2df128ab75
Marie Janssen [Wed, 14 Dec 2016 20:01:39 +0000 (20:01 +0000)]
Merge "Bluetooth: log message improvements"
am:
f34bdf7676
Change-Id: Ic89c59257559d95119829fa4157dbb763124e86f
Hall Liu [Wed, 14 Dec 2016 19:55:00 +0000 (19:55 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection"
Treehugger Robot [Wed, 14 Dec 2016 19:47:48 +0000 (19:47 +0000)]
Merge "Add an IPC for requesting network scores."
Treehugger Robot [Wed, 14 Dec 2016 19:47:31 +0000 (19:47 +0000)]
Merge "Bluetooth: log message improvements"
Android Build Merger (Role) [Wed, 14 Dec 2016 19:30:48 +0000 (19:30 +0000)]
Merge "fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa am:
1838237435 am:
7af83d0e5a" into nyc-mr2-dev-plus-aosp
Julius D'souza [Wed, 14 Dec 2016 19:30:03 +0000 (19:30 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa am:
1838237435
am:
7af83d0e5a
Change-Id: I0a52e7f2e1e71bbef0db99ca8373fe58dae4ac49
Julius D'souza [Wed, 14 Dec 2016 19:30:00 +0000 (19:30 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa am:
1838237435
am:
6b953b0f0b
Change-Id: Ida7cbc107a548a0f5451099f1a6b6d815d61927a
Julius D'souza [Wed, 14 Dec 2016 19:24:10 +0000 (19:24 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa
am:
1838237435
Change-Id: Ib189c8e059a6d867e9ece1d03c193dc5f8002fad
Julius D'souza [Wed, 14 Dec 2016 19:24:01 +0000 (19:24 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa
am:
1838237435
Change-Id: I1db5fee4adb196ff725815c3e4182f7e661e6d26
Julius D'souza [Wed, 14 Dec 2016 19:18:04 +0000 (19:18 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71
am:
8cc9f081aa
Change-Id: I39ecaf420d8bc4390c737fd378fd0e32202e2d8c
Julius D'souza [Wed, 14 Dec 2016 19:11:59 +0000 (19:11 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7
am:
20081c4e71
Change-Id: I5e461a835cf64ba69894da2c5493a9d8a1ebcbcf
Julius D'souza [Wed, 14 Dec 2016 19:06:29 +0000 (19:06 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8
am:
af0b547fc7
Change-Id: I23ef765ebbd2dde2110946fcc46c6b61e11733f2
Julius D'souza [Wed, 14 Dec 2016 19:00:38 +0000 (19:00 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours
am:
7a69e8f3d8
Change-Id: I581e1cd6ef0dec7042802b29dd76db8ffc02cec3
Julius D'souza [Wed, 14 Dec 2016 18:54:02 +0000 (18:54 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController
am:
e6f8cb29ec -s ours
Change-Id: Ia7bdba0fd3d52bb2d7c33f81d376336563f3a5cb
Julius D'souza [Wed, 14 Dec 2016 18:30:25 +0000 (10:30 -0800)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController
Bug:
31900521
Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c
Android Build Merger (Role) [Wed, 14 Dec 2016 18:24:41 +0000 (18:24 +0000)]
Merge "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:
a481fd31cf -s ours" into nyc-mr2-dev-plus-aosp
Julius D'souza [Wed, 14 Dec 2016 18:23:54 +0000 (18:23 +0000)]
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:
a481fd31cf -s ours
Change-Id: Ie297e4f891fbafb765d8ba12777012deeac49020
Android Build Merger (Role) [Wed, 14 Dec 2016 18:23:32 +0000 (18:23 +0000)]
Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am:
61b0f84005" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 14 Dec 2016 18:23:10 +0000 (18:23 +0000)]
Merge "Do not write if apply() did not change the file. am:
ea10cc0fbb" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 14 Dec 2016 18:22:45 +0000 (18:22 +0000)]
Merge "Only persist last Shared Preferences state am:
31d6889f4c" into nyc-mr2-dev-plus-aosp
Philip P. Moltmann [Wed, 14 Dec 2016 18:21:47 +0000 (18:21 +0000)]
Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev
am:
61b0f84005
Change-Id: I0d2d0cffe3a78a843ae97d3946bbbbd7d4138044
Philip P. Moltmann [Wed, 14 Dec 2016 18:21:39 +0000 (18:21 +0000)]
Do not write if apply() did not change the file.
am:
ea10cc0fbb
Change-Id: I58f1f71dd4a8b4725205555531fa5d66284e3cd0
Philip P. Moltmann [Wed, 14 Dec 2016 18:21:33 +0000 (18:21 +0000)]
Only persist last Shared Preferences state
am:
31d6889f4c
Change-Id: I0324e5e391d3d426cef8ef52ea04f529c5c7580f
Julius D'souza [Wed, 14 Dec 2016 18:21:23 +0000 (18:21 +0000)]
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 -s ours
Change-Id: Iec1380282c06bbe970c5e178143dede6939b8b0a
Julius D'souza [Wed, 14 Dec 2016 18:15:47 +0000 (18:15 +0000)]
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
Change-Id: Icf2354559cf4c0cac6d61d89378b00e9831e9e14
Julius D'souza [Wed, 14 Dec 2016 18:15:28 +0000 (18:15 +0000)]
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
Change-Id: Iac7c7e89a57c9e8717aa2fe9012b76595acbb2ea
Philip P. Moltmann [Wed, 14 Dec 2016 18:13:31 +0000 (18:13 +0000)]
Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev
* changes:
Do not write if apply() did not change the file.
Only persist last Shared Preferences state
Julius D'souza [Wed, 14 Dec 2016 18:09:25 +0000 (18:09 +0000)]
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
Change-Id: I75323469d9e15ea3b8652bb5f972d0e14a06cc7a
Julius D'souza [Wed, 14 Dec 2016 18:03:26 +0000 (18:03 +0000)]
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
Change-Id: I7a1d2d5b60b27765b2381e6d85fd3f8e967a40e1
Julius D'souza [Wed, 14 Dec 2016 17:56:53 +0000 (17:56 +0000)]
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
Change-Id: I0f1a50fac9a6fc8a5c21b890aaa3aea5ea2aca74
Marie Janssen [Tue, 13 Dec 2016 18:51:02 +0000 (10:51 -0800)]
Bluetooth: log message improvements
Some log improvements:
- Reduce logspam
- Use names for states in logs instead of numbers
- Be more consistent with messages
Also remove some commented out dead code.
Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
Julius D'souza [Wed, 14 Dec 2016 17:51:28 +0000 (17:51 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am:
f9f39cc4a8 -s ours
am:
589f83e686 -s ours
Change-Id: I76a619ed9824174735d0a86c55fe13a3d6e90ec5
Julius D'souza [Wed, 14 Dec 2016 17:44:27 +0000 (17:44 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle.
am:
f9f39cc4a8 -s ours
Change-Id: Ibd0b18a9e833afcc85845f4db57a927e80739cc2
Marco Nelissen [Wed, 14 Dec 2016 17:12:59 +0000 (17:12 +0000)]
Merge "Revert "Remove AmrInputStream"" am:
e2d8581529 am:
01cb199bed
am:
8b1eed4ee8
Change-Id: Iab40a083d9d0d2c9d4359be25e88d25f8fdc12aa
Jeremy Joslin [Wed, 14 Dec 2016 00:11:51 +0000 (16:11 -0800)]
Add an IPC for requesting network scores.
Migrating the NetworkScoreManager.requestScores() method to use an
IPC rather than a broadcast.
Defined the new IPC in the AIDL files for NetworkScoreService and
NetworkRecommendationProvider. Added a no-op implementation in
NetworkScoreService and a full implementation in
NetworkRecommendationProvider (plus tests).
Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
BUG:
33593157
Change-Id: Iacf7b6d424ec3c57e8b89e5abc6bc3e8414097b9
Merged-In: I951f6186aa11ddbe5a94e374173a1fd40b2a4cce
Marco Nelissen [Wed, 14 Dec 2016 17:05:59 +0000 (17:05 +0000)]
Merge "Revert "Remove AmrInputStream"" am:
e2d8581529
am:
01cb199bed
Change-Id: Icafcabcc2b99dac4d897e0d68725c53e84fdd5c5
Marco Nelissen [Wed, 14 Dec 2016 16:59:23 +0000 (16:59 +0000)]
Merge "Revert "Remove AmrInputStream""
am:
e2d8581529
Change-Id: I55615b328bedf67819d076ccb21b9bc1f13a07a8
Marco Nelissen [Wed, 14 Dec 2016 16:44:47 +0000 (16:44 +0000)]
Merge "Revert "Remove AmrInputStream""
Marco Nelissen [Wed, 14 Dec 2016 16:44:12 +0000 (16:44 +0000)]
Revert "Remove AmrInputStream"
This reverts commit
0c3518cc7724df29b790d9d81af9a105e7958cf7.
Change-Id: I250d86d2d6ce462cb5f29bc6c312d88a49ac24a4
Paul Duffin [Wed, 14 Dec 2016 15:16:51 +0000 (15:16 +0000)]
Merge "Copy core-junit files into legacy-test." am:
69e363f506 am:
884d3ca53b
am:
b5f056068d
Change-Id: Ib5f9f0744dbb610210394264d088df0db8b05988
Paul Duffin [Wed, 14 Dec 2016 15:15:51 +0000 (15:15 +0000)]
Copy core-junit files into legacy-test. am:
cd7c34d8bf am:
98e609d556
am:
c3650beee5
Change-Id: I04560b5982651d175a268056f32eb36980ef2259
Paul Duffin [Wed, 14 Dec 2016 15:10:30 +0000 (15:10 +0000)]
Merge "Copy core-junit files into legacy-test." am:
69e363f506
am:
884d3ca53b
Change-Id: I6d4a760fc740620578f324de6f847a3ec59600d5
Paul Duffin [Wed, 14 Dec 2016 15:09:22 +0000 (15:09 +0000)]
Copy core-junit files into legacy-test. am:
cd7c34d8bf
am:
98e609d556
Change-Id: I4eb422f8fe217e5528e632d1f85c1303604b0d64
Paul Duffin [Wed, 14 Dec 2016 15:02:20 +0000 (15:02 +0000)]
Merge "Copy core-junit files into legacy-test."
am:
69e363f506
Change-Id: I95f3c2005e87f86f7014f6bf693eae7212f54a73
Paul Duffin [Wed, 14 Dec 2016 15:02:16 +0000 (15:02 +0000)]
Copy core-junit files into legacy-test.
am:
cd7c34d8bf
Change-Id: I672fa4b006b04db5a4c8f86793f1c891bc55754a
Paul Duffin [Wed, 14 Dec 2016 14:50:55 +0000 (14:50 +0000)]
Merge "Copy core-junit files into legacy-test."
Paul Duffin [Mon, 12 Dec 2016 16:35:36 +0000 (16:35 +0000)]
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
Paul Duffin [Wed, 14 Dec 2016 13:47:09 +0000 (13:47 +0000)]
Merge "Copy junit-runner files into test-runner." am:
3e24af3eb7 am:
5d53a925a1
am:
49a848e46f
Change-Id: I92dee395822461470a5cf83d9bb63ba6ff2469c5
Paul Duffin [Wed, 14 Dec 2016 13:43:45 +0000 (13:43 +0000)]
Copy junit-runner files into test-runner. am:
eef35dd29a am:
b46cecb6c4
am:
b6421ce031
Change-Id: I00457223985f4ada91ca9df97bb24fe957de1b24
Paul Duffin [Wed, 14 Dec 2016 13:40:03 +0000 (13:40 +0000)]
Merge "Copy junit-runner files into test-runner." am:
3e24af3eb7
am:
5d53a925a1
Change-Id: I9239d238e51c61c6646022f64917348af27179ab
Paul Duffin [Wed, 14 Dec 2016 13:36:38 +0000 (13:36 +0000)]
Copy junit-runner files into test-runner. am:
eef35dd29a
am:
b46cecb6c4
Change-Id: I8f75a351d8e697b2fdbc4e1b3d06fd4ea25ffb0a
Paul Duffin [Wed, 14 Dec 2016 13:35:44 +0000 (13:35 +0000)]
Merge "Copy junit-runner files into test-runner."
am:
3e24af3eb7
Change-Id: I55ec07039052bf6030a16bfa0cbeedc8690809f7
Paul Duffin [Wed, 14 Dec 2016 13:30:03 +0000 (13:30 +0000)]
Copy junit-runner files into test-runner.
am:
eef35dd29a
Change-Id: I974279917ae3451abf44143161ac945f4153768f
Paul Duffin [Wed, 14 Dec 2016 13:22:39 +0000 (13:22 +0000)]
Merge "Copy junit-runner files into test-runner."
Erik Kline [Wed, 14 Dec 2016 11:39:44 +0000 (11:39 +0000)]
Merge "More correct startup and shutdown procedures." into nyc-mr2-dev
am:
c8059fb94c
Change-Id: Ib017af2b267689c0833b92c13f29da1d2e69a011
Erik Kline [Wed, 14 Dec 2016 11:39:36 +0000 (11:39 +0000)]
More correct startup and shutdown procedures.
am:
6c0782f1ae
Change-Id: Ib488e0cb49da2d3f655e189600f839721ea73358
TreeHugger Robot [Wed, 14 Dec 2016 11:33:35 +0000 (11:33 +0000)]
Merge "More correct startup and shutdown procedures." into nyc-mr2-dev
Michal Karpinski [Wed, 14 Dec 2016 10:58:32 +0000 (10:58 +0000)]
Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev
am:
d9eb4fce7d
Change-Id: If60d1886cd42d34aed83255e3262b6234645118d
Michal Karpinski [Wed, 14 Dec 2016 10:58:22 +0000 (10:58 +0000)]
DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
am:
e3639a0a07
Change-Id: Ie91f46915144c0f15e9a058b45ca7e55c54f796c
Michal Karpinski [Wed, 14 Dec 2016 10:57:26 +0000 (10:57 +0000)]
DO NOT MERGE Fix Lint errors for network logging API
am:
0c4ec00f85
Change-Id: I3fc8e08509440057c1d87dd2023cd2b7d8177530
Michal Karpinski [Wed, 14 Dec 2016 10:56:34 +0000 (10:56 +0000)]
DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
am:
c4e7c32063
Change-Id: I64e032e5482cb917cb298fea578e157f7d9038d3
Michal Karpinski [Wed, 14 Dec 2016 10:55:45 +0000 (10:55 +0000)]
DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users
am:
504fa62f9e
Change-Id: I36bae185c96e9ee9f04d8e14654560803d2e89a1
Michal Karpinski [Wed, 14 Dec 2016 10:54:55 +0000 (10:54 +0000)]
DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
am:
5c64223da4
Change-Id: I37fabc41064e7fd0a1c42dab61697f74721e0beb
Michal Karpinski [Wed, 14 Dec 2016 10:53:30 +0000 (10:53 +0000)]
DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
am:
896b9db8ed
Change-Id: I497a699c3137ef85c0ffd1c887bf8bd60600c182
Michal Karpinski [Wed, 14 Dec 2016 10:52:18 +0000 (10:52 +0000)]
DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times
am:
bbf352a2c1
Change-Id: I6df35873ec30044780fab02329bab327af8df161
Michal Karpinski [Wed, 14 Dec 2016 10:51:33 +0000 (10:51 +0000)]
DO NOT MERGE [DPM] Management and retrieval of network logs
am:
4c47adef60
Change-Id: I39486c9d6116023f1ee9bd576b7fcd0fe20023a1
Michal Karpinski [Wed, 14 Dec 2016 10:50:36 +0000 (10:50 +0000)]
DO NOT MERGE [DPM] DO can start network logging and listen for events
am:
c3abd34cfe
Change-Id: I7952d67d22a141040f3ee3ac2b6c3aa2cfccbbf7
Michal Karpinski [Wed, 14 Dec 2016 10:44:19 +0000 (10:44 +0000)]
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
Paul Duffin [Mon, 12 Dec 2016 12:22:31 +0000 (12:22 +0000)]
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
Erik Kline [Mon, 12 Dec 2016 12:21:40 +0000 (21:21 +0900)]
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
Ruben Brunk [Wed, 14 Dec 2016 08:28:08 +0000 (08:28 +0000)]
Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev
am:
3661a6f91b
Change-Id: I91f1912d21c5abd8d96130ee6037b2c08bc9df50
Ruben Brunk [Wed, 14 Dec 2016 08:27:58 +0000 (08:27 +0000)]
Fix VR interaction with screen on/off/lockscreen.
am:
040484cf90
Change-Id: I16023e2b02d9660b8c109c1586125316526f3fc9
TreeHugger Robot [Wed, 14 Dec 2016 08:22:29 +0000 (08:22 +0000)]
Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev
Erik Kline [Wed, 14 Dec 2016 08:13:30 +0000 (08:13 +0000)]
Merge "Stop setting net.hostname" am:
06178a39f8 am:
35cc49e03f
am:
da70b6b287
Change-Id: I9976537d761a761e9aeca5cb15298f689032664f
Erik Kline [Wed, 14 Dec 2016 08:07:01 +0000 (08:07 +0000)]
Merge "Stop setting net.hostname" am:
06178a39f8
am:
35cc49e03f
Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23
OSDN Git Service
