phweiss
a4e169ed68
Add network logging icon to Quicksettings when enabled
...
Add the network logging icon in Quick Settings' footer if
network logging is enabled, possible next to the VPN icon.
Quicksettings has to be able to tell that network logging
is enabled, so this CL changes DPM.isNetworkLoggingEnabled() to be
callable from the device owner or from any app with the MANAGE_USERS
permission.
The icon is only a placeholder until the official icon is finished.
CTS Verifier tests will be added when all Network logging UX changes are
done.
BUG: 33126618
BUG: 29748723
Test: runtest --path frameworks/base/packages/SystemUI/tests
Change-Id: Ib35d323605ab11f883a4b6199d1db79b9e53c49b
2016-12-08 16:34:25 +01:00
Wale Ogunwale
ea92d97733
Don't return null in WS.getTopParentWindow on child detach
...
Fixed issue with WindowState.getTopParentWindow() returning null when
the child window is removed from it's parent. In this case it should
return itself as the method documentation states.
Change-Id: Iae40ca21241306048cae136887afc88593a6898d
Fixes: 33446267
Test: bit FrameworksServicesTests:com.android.server.wm.WindowStateTests
2016-12-08 07:33:13 -08:00
Paul Duffin
df2576045e
Move android.test classes from core/java to legacy-test/src
...
(cherry picked from 2395179afb )
Bug: 30188076
Test: make checkbuild
Merged-In: Ifa291909fcf47da788627b496bd72f54efd78ed7
Change-Id: Ie20dceb9f89df245ed6da5fc2fb06185bd7b104b
2016-12-08 14:55:35 +00:00
Paul Duffin
2395179afb
Move android.test classes from core/java to legacy-test/src
...
Bug: 30188076
Test: make checkbuild
Change-Id: Ifa291909fcf47da788627b496bd72f54efd78ed7
2016-12-08 14:49:35 +00:00
Geoffrey Pitsch
847eb5aba8
LayoutInflaterBuilder helper in systemui util
...
Useful for tests that want to inflate production layouts but with
some classes replaced with Testable/Mock instances. Located in
SystemUI until more clients can be found.
Test: See ag/1630107
Change-Id: I4addb4cb4adfdf8c3e8f065dd3926574dc352e84
2016-12-08 09:36:45 -05:00
TreeHugger Robot
3c41744b8c
Merge "Clear DISALLOW_ADD_USER user restriction when dpm remove-active-admin is called from shell"
2016-12-08 13:54:41 +00:00
Johan Redestig
87b29367a2
Add IMEI_NOT_ACCEPTED disconnect cause
...
Bug: 33263903
Test: manual (simulated error code from the network)
Change-Id: I3c01b0ad5d55f30b4a52845f09c801358e977a01
2016-12-08 13:04:46 +01:00
Lorenzo Colitti
256d5cd65f
Merge changes from topic 'framework-net-aosp' am: b92aa5bdfd am: 0a7f2d076d
...
am: 9aa93df2b4
Change-Id: I4697d66a7a76bc7d135e843aa201caa5e8242ac4
2016-12-08 11:35:03 +00:00
Etan Cohen
4e7b5c25d8
DO NOT MERGE: [CS] Remove timeout event after first available am: bf3b1bad15 -s ours am: a8b73b23d6 -s ours
...
am: ce10ba98bf
Change-Id: If94bc1b3dd0ed5ad697656303ca434152b4a5b18
2016-12-08 11:34:09 +00:00
Hugo Benichi
8cc63f2554
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest am: 5d2654124e -s ours am: 2a2e22ab23 -s ours
...
am: a053ead6a9
Change-Id: If2dc382184f3e00f67838ed348d454f3a9b0bc41
2016-12-08 11:33:21 +00:00
Lorenzo Colitti
fb636d1faa
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest. am: 5bce5a16b1 -s ours am: efd928fe56 -s ours
...
am: 5cf18abca9
Change-Id: I1846d606bdcc35b099f03554107f8ccfe0704a93
2016-12-08 11:32:26 +00:00
Lorenzo Colitti
3cf39b018c
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net. am: 7ceef950a0 -s ours am: d1e22a3f07 -s ours
...
am: 4c4a86fd4d
Change-Id: I6b52a0383884ad41b1601bdd9cf976f58c0dcefd
2016-12-08 11:31:13 +00:00
Lorenzo Colitti
77852d0a9f
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils. am: 3c295b59f5 -s ours am: bcb7e32954 -s ours
...
am: eb7b7664cb
Change-Id: I261c10f930d32c6d69d0ced4d0d7d81f3357cf63
2016-12-08 11:30:17 +00:00
Lorenzo Colitti
0c34c32534
DO NOT MERGE: Move FakeSettingsProvider to a common location. am: b8df76e413 -s ours am: a84ede299c -s ours
...
am: 33b238bd42
Change-Id: I3e877a603c1c19af15e5f38d4e0301dfddfc6f39
2016-12-08 11:29:28 +00:00
Hugo Benichi
80587a02cc
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such am: 5d540d1410 -s ours am: e47b0886ad -s ours
...
am: 412e89fe9f
Change-Id: If5133073f09b59b0458c1784b9d288f9a176c568
2016-12-08 11:28:34 +00:00
Calvin On
c39a37c0d6
DO NOT MERGE: Add option to skip and avoid captive portals. am: 1f64f3fd14 -s ours am: 8006bd5c66 -s ours
...
am: 573880a198
Change-Id: I7e7f6fa8d643bbd83c9b73614f80d202e3f28f20
2016-12-08 11:27:11 +00:00
Hugo Benichi
52587963ca
DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime am: dafc44ea11 -s ours am: d063978acf -s ours
...
am: 9c37634688
Change-Id: I08c00727a2746760d78f03e90a2fcbadf60ce2d2
2016-12-08 11:26:19 +00:00
Hugo Benichi
9a686a26c6
DO NOT MERGE: Do not synchronize boolean reads/writes am: 94dcb3c3fd -s ours am: eb98bc95d2 -s ours
...
am: a63d5e5fd8
Change-Id: I4de7bc73125acad6e45783835a9ec6063b5e260b
2016-12-08 11:25:31 +00:00
Hugo Benichi
eaf63414bf
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters am: 4104ff9220 -s ours am: 2889968553 -s ours
...
am: 02f1650458
Change-Id: I40383c9c322d7bf3eb85f74202e79d0fa19cffa5
2016-12-08 11:24:38 +00:00
Hugo Benichi
796a0babf9
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing am: 0668a61d82 -s ours am: 976ef7538a -s ours
...
am: 046c5a3119
Change-Id: Id643a779050fa557632117e90dd9f1f6589fbd5e
2016-12-08 11:23:17 +00:00
Erik Kline
cea7843c61
DO NOT MERGE: Support timeouts for requestNetwork() invocations. am: 3841a48d0a -s ours am: eb6be2c826 -s ours
...
am: e8dda0f7e4
Change-Id: I3cba7c98328a4237105243502fe148ed6a35ef48
2016-12-08 11:22:25 +00:00
Pierre Imai
59d46341c8
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network. am: accd5fcb79 -s ours am: 8a73b2896d -s ours
...
am: a8500b7efc
Change-Id: I20016d9056888897515e6a4b4296e3ea76f11b61
2016-12-08 11:21:31 +00:00
Lorenzo Colitti
9aa93df2b4
Merge changes from topic 'framework-net-aosp' am: b92aa5bdfd
...
am: 0a7f2d076d
Change-Id: I9f8ef7f4fad821a02f3455e710d16d121b9213a2
2016-12-08 11:08:42 +00:00
Etan Cohen
ce10ba98bf
DO NOT MERGE: [CS] Remove timeout event after first available am: bf3b1bad15 -s ours
...
am: a8b73b23d6 -s ours
Change-Id: I61fbbf03bc011ae0b6b0e011bfb69dea33195c79
2016-12-08 11:07:46 +00:00
Hugo Benichi
a053ead6a9
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest am: 5d2654124e -s ours
...
am: 2a2e22ab23 -s ours
Change-Id: I8b47225c8a6b3b7214b9b0a89971984d2f9fc9e3
2016-12-08 11:06:58 +00:00
Lorenzo Colitti
5cf18abca9
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest. am: 5bce5a16b1 -s ours
...
am: efd928fe56 -s ours
Change-Id: I08660dacb99bb50654157ce5d507247339cd2348
2016-12-08 11:05:48 +00:00
Lorenzo Colitti
4c4a86fd4d
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net. am: 7ceef950a0 -s ours
...
am: d1e22a3f07 -s ours
Change-Id: I92f0f18ed7ee196f1cdb1369393ff7c4e2c800fc
2016-12-08 11:04:38 +00:00
Lorenzo Colitti
eb7b7664cb
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils. am: 3c295b59f5 -s ours
...
am: bcb7e32954 -s ours
Change-Id: I377b66283b29bb97e02ec796352bc3a5dbea1454
2016-12-08 11:03:45 +00:00
Lorenzo Colitti
33b238bd42
DO NOT MERGE: Move FakeSettingsProvider to a common location. am: b8df76e413 -s ours
...
am: a84ede299c -s ours
Change-Id: Ia6f433944c63245436199b8b9b1a022794ab939e
2016-12-08 11:02:57 +00:00
Hugo Benichi
412e89fe9f
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such am: 5d540d1410 -s ours
...
am: e47b0886ad -s ours
Change-Id: I803b51cae7b20502d11701cb99ab3816d6995555
2016-12-08 11:02:09 +00:00
Calvin On
573880a198
DO NOT MERGE: Add option to skip and avoid captive portals. am: 1f64f3fd14 -s ours
...
am: 8006bd5c66 -s ours
Change-Id: I9984984de7f72e23fbc11e972ff851a1d2adc6c1
2016-12-08 11:00:46 +00:00
Hugo Benichi
9c37634688
DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime am: dafc44ea11 -s ours
...
am: d063978acf -s ours
Change-Id: Iae654ce24cba1e968f14b8b6cd74446c99135b0c
2016-12-08 11:00:00 +00:00
Hugo Benichi
a63d5e5fd8
DO NOT MERGE: Do not synchronize boolean reads/writes am: 94dcb3c3fd -s ours
...
am: eb98bc95d2 -s ours
Change-Id: I897ff8b2072a4fcbf42e88d4ad61ffcec2d85331
2016-12-08 10:59:14 +00:00
Hugo Benichi
02f1650458
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters am: 4104ff9220 -s ours
...
am: 2889968553 -s ours
Change-Id: I935fd216a905688a51d928dada3485a0117dbbf1
2016-12-08 10:58:28 +00:00
Hugo Benichi
046c5a3119
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing am: 0668a61d82 -s ours
...
am: 976ef7538a -s ours
Change-Id: I10b1ea356622de68d75ee65f8ab4ae937c11171a
2016-12-08 10:57:26 +00:00
Erik Kline
e8dda0f7e4
DO NOT MERGE: Support timeouts for requestNetwork() invocations. am: 3841a48d0a -s ours
...
am: eb6be2c826 -s ours
Change-Id: Id91b2267ffcd7c66a1be8e01761ffb1d943082d3
2016-12-08 10:56:13 +00:00
Pierre Imai
a8500b7efc
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network. am: accd5fcb79 -s ours
...
am: 8a73b2896d -s ours
Change-Id: Ic529525e6671da1b6a85890c8eb40238b07da2b3
2016-12-08 10:54:56 +00:00
Lorenzo Colitti
0a7f2d076d
Merge changes from topic 'framework-net-aosp'
...
am: b92aa5bdfd
Change-Id: I9f4cb99312b61e47bfb80f35a5c2478bc1be2473
2016-12-08 10:15:03 +00:00
Etan Cohen
a8b73b23d6
DO NOT MERGE: [CS] Remove timeout event after first available
...
am: bf3b1bad15 -s ours
Change-Id: I24ccd42ff2078ffac5560a132dcd2432118f6788
2016-12-08 10:14:55 +00:00
Hugo Benichi
2a2e22ab23
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
...
am: 5d2654124e -s ours
Change-Id: I8cfbe35c719dc2f135ec695f346c555fb45dfa58
2016-12-08 10:14:16 +00:00
Lorenzo Colitti
efd928fe56
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
...
am: 5bce5a16b1 -s ours
Change-Id: I820b911f737e8b00ff3069505a2412ba9fdf3e1c
2016-12-08 10:13:37 +00:00
Lorenzo Colitti
d1e22a3f07
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
...
am: 7ceef950a0 -s ours
Change-Id: I866c317dbec720a5ec6c64b1e7e14437d132ce7e
2016-12-08 10:12:57 +00:00
Lorenzo Colitti
bcb7e32954
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
...
am: 3c295b59f5 -s ours
Change-Id: I72123940742a0ca1418f8c892da82b6bb984f4ae
2016-12-08 10:11:44 +00:00
Lorenzo Colitti
a84ede299c
DO NOT MERGE: Move FakeSettingsProvider to a common location.
...
am: b8df76e413 -s ours
Change-Id: I017a302961d252a3fe4e062a0642b79d64230f54
2016-12-08 10:11:01 +00:00
Hugo Benichi
e47b0886ad
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
...
am: 5d540d1410 -s ours
Change-Id: I2bd4e64b397fe2bd6ec8a11b02753c26df1a2000
2016-12-08 10:10:22 +00:00
Calvin On
8006bd5c66
DO NOT MERGE: Add option to skip and avoid captive portals.
...
am: 1f64f3fd14 -s ours
Change-Id: I549bc49715a6476069f30aa206d8b4d1310fe6c5
2016-12-08 10:09:43 +00:00
Hugo Benichi
d063978acf
DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime
...
am: dafc44ea11 -s ours
Change-Id: Ic80e642dffa4f1246e91aeaa5bdedf450f703ccd
2016-12-08 10:09:05 +00:00
Hugo Benichi
eb98bc95d2
DO NOT MERGE: Do not synchronize boolean reads/writes
...
am: 94dcb3c3fd -s ours
Change-Id: If30f221e24c897be9e2fddf66a9d6c9db2b5a431
2016-12-08 10:08:15 +00:00
Hugo Benichi
2889968553
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters
...
am: 4104ff9220 -s ours
Change-Id: I699a4d4403e21c3ebb59e29c7732dba78eb006d7
2016-12-08 10:07:12 +00:00
Hugo Benichi
976ef7538a
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
...
am: 0668a61d82 -s ours
Change-Id: I961d0fd200c1317e1e81657071acf1fe7ae43f6f
2016-12-08 10:06:34 +00:00