OSDN Git Service
Mark Lu [Fri, 16 Dec 2016 05:06:42 +0000 (05:06 +0000)]
docs: changes to broadcast documentation am:
33ec106d22
am:
377dab8ab3
Change-Id: I2e8377b188ce6a10ea633e089c3a20f9ef7908fd
Mark Lu [Fri, 16 Dec 2016 04:59:08 +0000 (04:59 +0000)]
docs: changes to broadcast documentation
am:
33ec106d22
Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987
Tamas Berghammer [Fri, 16 Dec 2016 01:21:31 +0000 (01:21 +0000)]
Merge "Install all files from the lib directory for debuggable apps" am:
c0cc7c646c
am:
736852e2c4
Change-Id: I0faa3ab541ca8d1400719653171b4bcafceada81
Adrian Roos [Fri, 16 Dec 2016 01:20:12 +0000 (01:20 +0000)]
Merge "Assist app is not launched when long-pressing on Home key" am:
1e41bb4887
am:
d81fde40ef
Change-Id: Ia8f58cfa1945a7ad627889545a264c9d1fb06beb
Tamas Berghammer [Fri, 16 Dec 2016 00:48:21 +0000 (00:48 +0000)]
Merge "Install all files from the lib directory for debuggable apps"
am:
c0cc7c646c
Change-Id: Idc3b17fa4044ab0dd50fa141f1ec5ec8a47810b0
Treehugger Robot [Fri, 16 Dec 2016 00:35:54 +0000 (00:35 +0000)]
Merge "Install all files from the lib directory for debuggable apps"
Adrian Roos [Fri, 16 Dec 2016 00:01:24 +0000 (00:01 +0000)]
Merge "Assist app is not launched when long-pressing on Home key"
am:
1e41bb4887
Change-Id: I3d88e9116c45cec013c4b7a3bb3f53480f0f2af6
Adrian Roos [Thu, 15 Dec 2016 23:51:11 +0000 (23:51 +0000)]
Merge "Assist app is not launched when long-pressing on Home key"
Shinji Sogo [Thu, 15 Dec 2016 23:04:21 +0000 (23:04 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID" am:
69e7f9683d
am:
e67395a97a
Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723
Shinji Sogo [Thu, 15 Dec 2016 22:32:03 +0000 (22:32 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
am:
69e7f9683d
Change-Id: I7ce35b895d24b013169aa30b794fb524bac09990
Treehugger Robot [Thu, 15 Dec 2016 22:17:47 +0000 (22:17 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
Michael Kwan [Thu, 15 Dec 2016 21:16:19 +0000 (21:16 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am:
738fb65657
Change-Id: Ica017f0a0490c522777f20e38b7db16872ccc615
Michael Kwan [Thu, 15 Dec 2016 21:16:15 +0000 (21:16 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures.
am:
8a9b27773b
Change-Id: If7040c0f1cc71edcc16021b4825fb5d1d6fbdecf
Michael Kwan [Thu, 15 Dec 2016 21:09:53 +0000 (21:09 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
Martijn Coenen [Thu, 15 Dec 2016 20:47:05 +0000 (20:47 +0000)]
Merge "HwBinder: Remove use of IHw class." am:
11ec22ab2a
am:
df296fe1fa
Change-Id: I1c1069b5d2c1452f1cc9ee33725c3fa8f541966c
dcashman [Thu, 15 Dec 2016 20:45:55 +0000 (20:45 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components." am:
a1c9c860a9
am:
455202b9db
Change-Id: I2a314f827db34cc92058729629d9000526b43027
dcashman [Thu, 15 Dec 2016 20:41:14 +0000 (20:41 +0000)]
Split mac_permissions.xml into plat and non-plat components. am:
b1cc4f8ca4
am:
2a7ce100b7
Change-Id: I9d0e0f824fdc26c64d41f97b370f7483b63b97c5
Martijn Coenen [Thu, 15 Dec 2016 20:38:07 +0000 (20:38 +0000)]
Merge "HwBinder: Remove use of IHw class."
am:
11ec22ab2a
Change-Id: Icbeb3bb7548b00c5e28f689c761a4de425e1bd74
dcashman [Thu, 15 Dec 2016 20:32:54 +0000 (20:32 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
am:
a1c9c860a9
Change-Id: I11397c898e5cf7b0dd4a300646b409d28eb00b59
Martijn Coenen [Thu, 15 Dec 2016 20:28:48 +0000 (20:28 +0000)]
Merge "HwBinder: Remove use of IHw class."
dcashman [Thu, 15 Dec 2016 20:27:27 +0000 (20:27 +0000)]
Split mac_permissions.xml into plat and non-plat components.
am:
b1cc4f8ca4
Change-Id: I4c3d3a9c088c4cfc75f5503966390030e1375305
Treehugger Robot [Thu, 15 Dec 2016 20:13:28 +0000 (20:13 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
Phil Weaver [Thu, 15 Dec 2016 19:05:00 +0000 (19:05 +0000)]
Add null check to a11y interrupt.
am:
74f9e1b867
Change-Id: I51bcf42327f30a0c6b1dc7666a5c057d44eec98c
dcashman [Wed, 14 Dec 2016 21:46:05 +0000 (13:46 -0800)]
Split mac_permissions.xml into plat and non-plat components.
Bug:
31363362
Test: Bullhead and Sailfish both build and boot without new denials.
Change-Id: Ic9523ce4b0755d6c585548f4f2b1f00e7000195b
Erik Kline [Thu, 15 Dec 2016 12:28:41 +0000 (12:28 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am:
80ff5ecd4a
am:
cdcc931d93
Change-Id: Ib46bdab897cef221f4c22326e562130822d42298
Erik Kline [Thu, 15 Dec 2016 12:22:06 +0000 (12:22 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
am:
80ff5ecd4a
Change-Id: If85702e1cc44967841ab91d723aa627862bcda21
Erik Kline [Thu, 15 Dec 2016 12:10:16 +0000 (12:10 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
Joachim Sauer [Thu, 15 Dec 2016 11:39:37 +0000 (11:39 +0000)]
Merge "API updated for ICU4J 58.1" am:
9e3b160fc3
am:
d20aebb443
Change-Id: Ib3ddf7441306adca048e2ef5c6cda31bb2543df6
Joachim Sauer [Thu, 15 Dec 2016 11:24:52 +0000 (11:24 +0000)]
Merge "API updated for ICU4J 58.1"
am:
9e3b160fc3
Change-Id: If8d8b9708217442bf23f092ef2e1bfd235926aff
Joachim Sauer [Thu, 15 Dec 2016 11:16:39 +0000 (11:16 +0000)]
Merge "API updated for ICU4J 58.1"
Erik Kline [Wed, 19 Oct 2016 08:42:01 +0000 (17:42 +0900)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug:
21859053
Bug:
26101306
Bug:
31742572
Bug:
31707128
Bug:
33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
Phil Weaver [Wed, 2 Nov 2016 22:40:42 +0000 (15:40 -0700)]
Add null check to a11y interrupt.
Also adding same robustness to interrupt that we have for
sending a11y events.
Bug:
32507871
Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit
867ad35d9c676b5ba2047b0fc9a4006737e5c4aa)
Colin Cross [Thu, 15 Dec 2016 07:18:02 +0000 (07:18 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536 am:
c2f9ae35e6
am:
4379639606
Change-Id: I1d29954997012b2ac435dab96486175a40cd65a8
Colin Cross [Thu, 15 Dec 2016 07:16:31 +0000 (07:16 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private am:
19def9943a
am:
174d150673
Change-Id: I0d97c3bc96c0beebc5988e4dca22ba4d5d1f982c
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:01:01 +0000 (07:01 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536
am:
c2f9ae35e6
Change-Id: Icd7cc5949d1388a5f928561dc0eea8a7df91b1b9
Colin Cross [Thu, 15 Dec 2016 07:00:54 +0000 (07:00 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private
am:
19def9943a
Change-Id: Ic26ef842f58a9db61e7ee12b3d4d858fc24cfbc8
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
Treehugger Robot [Thu, 15 Dec 2016 06:49:35 +0000 (06:49 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536
* changes:
Move hwui private headers to frameworks/base/libs/hwui/private
Convert libstorage to Android.bp
Move libstorage includes into frameworks/base/lib/storage
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: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
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:34:20 +0000 (13:34 -0800)]
Move hwui private headers to frameworks/base/libs/hwui/private
hwui already exports most of its headers, move its private headers
into its source directory.
Bug:
33630870
Test: m -j native
Change-Id: I4968d5aaaa68d9e92c826841d20f29cef349c9d8
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"
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: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
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
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
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: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: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."
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 [Wed, 14 Dec 2016 08:07:01 +0000 (08:07 +0000)]
Merge "Stop setting net.hostname" am:
06178a39f8
am:
35cc49e03f
Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23
Erik Kline [Wed, 14 Dec 2016 07:59:59 +0000 (07:59 +0000)]
Merge "Stop setting net.hostname"
am:
06178a39f8
Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62
Treehugger Robot [Wed, 14 Dec 2016 07:51:00 +0000 (07:51 +0000)]
Merge "Stop setting net.hostname"
Erik Kline [Wed, 14 Dec 2016 03:06:53 +0000 (12:06 +0900)]
Stop setting net.hostname
Test: as follows
- basics:
- built
- flashed
- booted
- connect to {v4-only, dualstack, v6-only} networks
- verified expected connectivity on each
- runtest frameworks-net
Bug:
30979015
Change-Id: I65e9878c7b8eaddaba1c0e1b8566ddfa0760047f
Erik Kline [Wed, 14 Dec 2016 03:29:10 +0000 (03:29 +0000)]
Merge "DHCPv4 anonymity profile: support skipping hostname option" am:
eef38717b9
am:
94e328c22f
Change-Id: I4d46a9aa4b601098e55bf681906cb245d4d9a5cb
Erik Kline [Wed, 14 Dec 2016 03:22:12 +0000 (03:22 +0000)]
Merge "DHCPv4 anonymity profile: support skipping hostname option"
am:
eef38717b9
Change-Id: Id0eff1bdb60f1895fa6dd6c619071994efd79939
Treehugger Robot [Wed, 14 Dec 2016 03:07:48 +0000 (03:07 +0000)]
Merge "DHCPv4 anonymity profile: support skipping hostname option"
Mark Lu [Mon, 5 Dec 2016 18:57:55 +0000 (10:57 -0800)]
docs: changes to broadcast documentation
- move BroadcastReceiver info to developer guide. see cl/
140402421
- add usage note to CONNECTIVITY_ACTION broadcast
bug:
32533262
bug:
33106411
Change-Id: Ic2aa517831d29418e0c42aa6fc1e7f9aeb50f802
Julius D'souza [Tue, 13 Dec 2016 01:15:17 +0000 (17:15 -0800)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController
is going idle.
The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it. But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.
It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.
Bug:
31900521
Change-Id: I706045aa189147824c9214c57abc13993aee9a5b
OSDN Git Service
