OSDN Git Service
Jiaquan He [Wed, 18 Jan 2017 22:19:32 +0000 (22:19 +0000)]
Add keyboard support to Grid-based Recents.
am:
21f495f07b
Change-Id: I5b2f1bb2e6c8a84e1bc14fa428a1c00af3abe31f
Jiaquan He [Wed, 18 Jan 2017 22:10:42 +0000 (22:10 +0000)]
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev
am:
a88749fb51
Change-Id: I12837318cf0f4baa595155f02c6fd9324f7ee55b
Jiaquan He [Wed, 18 Jan 2017 22:10:35 +0000 (22:10 +0000)]
2D Recents: Fix issue with undocking only one task
am:
244bac6c8b
Change-Id: I3038a85bb5b351a4a753fa9fd31a205c1dd1f2aa
TreeHugger Robot [Wed, 18 Jan 2017 22:06:20 +0000 (22:06 +0000)]
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 18 Jan 2017 21:15:55 +0000 (21:15 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
b6973a8c82 -s ours" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 18 Jan 2017 21:15:31 +0000 (21:15 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours am:
f102bc4a2f -s ours" into nyc-mr2-dev-plus-aosp
Svet Ganov [Wed, 18 Jan 2017 21:15:03 +0000 (21:15 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours
am:
b6973a8c82 -s ours
Change-Id: I3d3bf6c25475a8fb773d6298ddf648d0bd2a5846
Svet Ganov [Wed, 18 Jan 2017 21:14:50 +0000 (21:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am:
b8c8b67789 -s ours
am:
f102bc4a2f -s ours
Change-Id: Icc0f74b69806d22e218fc221aadd37194f8aa994
Android Build Merger (Role) [Wed, 18 Jan 2017 21:14:43 +0000 (21:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours am:
cf7b579868 -s ours" into nyc-mr2-dev-plus-aosp
Svet Ganov [Wed, 18 Jan 2017 21:13:52 +0000 (21:13 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours
am:
cf7b579868 -s ours
Change-Id: I1201d0f79dfb06868112dcbebd9dc637cd107871
Svet Ganov [Wed, 18 Jan 2017 21:13:48 +0000 (21:13 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours
am:
79b20c88e2 -s ours
Change-Id: I065da31e12dd71dc2ab8b8304a73cba7271568d3
Svet Ganov [Wed, 18 Jan 2017 21:04:24 +0000 (21:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
am:
b8c8b67789 -s ours
Change-Id: Iae2e5a94b21db8f35a67466bc039966315c73f46
Svet Ganov [Wed, 18 Jan 2017 21:04:21 +0000 (21:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
am:
b8c8b67789 -s ours
Change-Id: I502a61cc0c1c6caaf18a7d0c03aa558541b3c17f
Svet Ganov [Wed, 18 Jan 2017 21:04:21 +0000 (21:04 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am:
4a601f972a -s ours
Change-Id: I8798244ed83cab82094aed1705d719cf5c2188e4
Svet Ganov [Wed, 18 Jan 2017 21:04:19 +0000 (21:04 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am:
4a601f972a -s ours
Change-Id: Id66c49cfa6010ab327f46e85a6940bd52102eeea
TreeHugger Robot [Wed, 18 Jan 2017 20:57:07 +0000 (20:57 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
Pavlin Radoslavov [Wed, 18 Jan 2017 20:42:33 +0000 (20:42 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34 am:
fd2f4bbcca
am:
14e9d1c33f
Change-Id: I243082e8553c97aa3b28d6e3e72e988136d305cc
Tamas Berghammer [Wed, 18 Jan 2017 20:33:44 +0000 (20:33 +0000)]
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
am:
a553354e84
Change-Id: I7e969a4988bdc01f21f09137cfe2f8e692101a3c
Tamas Berghammer [Wed, 18 Jan 2017 20:32:44 +0000 (20:32 +0000)]
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
am:
b4050d8042
Change-Id: I9d5789a9c4f12c12c5cc13eb8f92d3084a818440
Pavlin Radoslavov [Wed, 18 Jan 2017 20:30:44 +0000 (20:30 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34
am:
fd2f4bbcca
Change-Id: I3c253b5ee444f23fc81dc607dcc85e95b2aa3226
Pavlin Radoslavov [Wed, 18 Jan 2017 20:26:52 +0000 (20:26 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am:
5fd543ec34
Change-Id: I69c8396f015dc926c135a0284a347c6d6d8ca870
Tamas Berghammer [Wed, 18 Jan 2017 20:23:54 +0000 (20:23 +0000)]
DO NOT MERGE: Revert "Fix build"
am:
a0a908f5d6
Change-Id: I3ba66290b49fbe184eff424f5e70b8f32ed6fb3e
Tamas Berghammer [Wed, 18 Jan 2017 20:22:57 +0000 (20:22 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am:
24d8553316 -s ours
Change-Id: I09a58385e10e135af06dff346624dcbc9eb76a4f
Treehugger Robot [Wed, 18 Jan 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
Tamas Berghammer [Wed, 18 Jan 2017 19:59:50 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
Tamas Berghammer [Wed, 18 Jan 2017 19:59:50 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
Tamas Berghammer [Wed, 18 Jan 2017 16:36:46 +0000 (16:36 +0000)]
DO NOT MERGE: Revert "Fix build"
This reverts commit
005055c070a4e174a493fe585e467c0e711b96e9.
Change-Id: Ia71d1e95de48bc1d83a4924041953a2d42ed6a93
Tamas Berghammer [Wed, 18 Jan 2017 16:17:32 +0000 (16:17 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit
cbd3f0c59a75e0b46dbb0635e81f82b8b9617791.
Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
Svet Ganov [Tue, 17 Jan 2017 21:50:46 +0000 (13:50 -0800)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
Bug:
34193954
Change-Id: Id744fd190ef78e498e635c2ab9936f12d0bbc917
(cherry picked from commit
6130fb741c86d7d4f0f86e3a875c3eca1fe8aa51)
Pavlin Radoslavov [Tue, 17 Jan 2017 21:04:13 +0000 (13:04 -0800)]
Update/cleanup Bluetooth Codec strings in Developer Settings
Misc. fixes and cleanup related to the Bluetooth Codec strings
in Developer Settings:
* Update the codec name "aptX-HD" -> "aptX HD" to reflect the vendor
defined writing:
https://www.aptx.com/aptx-hd
* Increase some of the "CHAR LIMIT" values for the purpose
of translation to other languages
* Update some of the text in the UI (for clarity)
* Added new string: "Streaming: " that is used in the UI summary
Test: UI visual observation
Bug: b/
34188102 b/
34206536 b/
34209576 b/
34210861 b/
34207126 b/
34211204
Bug: b/
34206992 b/
34210910 b/
34210162 b/
34205434 b/
34198432 b/
34186749
Bug: b/
34188141 b/
34188657 b/
34192932 b/
34188655
Change-Id: I9dc609594864b5d29394c49e0bce64416706c81c
Glen Kuhne [Wed, 18 Jan 2017 18:57:40 +0000 (18:57 +0000)]
Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4 am:
d2f5fd3c42
am:
878fcfaa22
Change-Id: Ib4a59d41088ba00b21ccaeea6a9e7578c24ab8da
Kenny Guy [Wed, 18 Jan 2017 18:55:17 +0000 (18:55 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864
am:
c8a6eb1382
Change-Id: I8c6af06495a4a4b4687c235c904e2a2d7d1480bc
Tucker Sylvestro [Wed, 18 Jan 2017 18:54:12 +0000 (18:54 +0000)]
svc nfc should support watches too am:
1876583bfb
am:
baa26e2d3d
Change-Id: I14f715f5b6937e7f2c5fb55a69fbeb750e31186b
Jay [Wed, 18 Jan 2017 18:53:20 +0000 (18:53 +0000)]
Merge "Notify user switch event to NetworkController" am:
1aa24246cf am:
4ab0e9f824
am:
3f326e7011
Change-Id: I9a844a8bf1fb7bc3cfabc0832e7fb532278cda99
Jason Monk [Wed, 18 Jan 2017 18:52:14 +0000 (18:52 +0000)]
Fix build
am:
005055c070
Change-Id: Ica900e6a6e7413408ac5d79dedfcf41526011be0
Jason Monk [Wed, 18 Jan 2017 18:45:59 +0000 (13:45 -0500)]
resolve merge conflicts of
54bce9c6ff1f to nyc-mr2-dev-plus-aosp
Change-Id: Ifaea1d0f58ea81a7d929dc891fe69c8d7c15af4e
Glen Kuhne [Wed, 18 Jan 2017 18:25:52 +0000 (18:25 +0000)]
Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4
am:
d2f5fd3c42
Change-Id: I20fbec10c7a3355d80a305583308095954ff5488
Glen Kuhne [Wed, 18 Jan 2017 18:20:43 +0000 (18:20 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"
am:
c82d1ddaf4
Change-Id: I12e44cf9c75f76712eb2c89fbd878a7cb74ec8a9
Glen Kuhne [Wed, 18 Jan 2017 18:08:35 +0000 (18:08 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"
Tamas Berghammer [Wed, 18 Jan 2017 18:06:43 +0000 (18:06 +0000)]
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
am:
3db5d42f90
Change-Id: Ia944e535f7329c32bf34770fb0d99019cc1091f9
Android Build Merger (Role) [Wed, 18 Jan 2017 18:01:56 +0000 (18:01 +0000)]
Merge "Update package names to work with the proto3 compiler am:
cbd3f0c59a -s ours" into nyc-mr2-dev-plus-aosp
Kenny Guy [Wed, 18 Jan 2017 17:55:04 +0000 (17:55 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864
am:
748e78bd2c
Change-Id: I6d8c1b6e6f6b171527fa48bf477926a31aa5aacf
Kenny Guy [Wed, 18 Jan 2017 17:47:03 +0000 (17:47 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed
am:
1894632864
Change-Id: I10ed70e5aef941dd7b31f381f78eb8418985f33c
Kenny Guy [Wed, 18 Jan 2017 17:47:02 +0000 (17:47 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed
am:
1894632864
Change-Id: I4328578f929875fd59f48681b8ae2c7c4d3bd623
Tamas Berghammer [Wed, 18 Jan 2017 17:44:23 +0000 (17:44 +0000)]
Update package names to work with the proto3 compiler
am:
cbd3f0c59a -s ours
Change-Id: I8c957a9ad00cb393dbaaa05bec9730cc3a84a94e
Kenny Guy [Wed, 18 Jan 2017 17:33:33 +0000 (17:33 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af
am:
ee9f03d1ed
Change-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05
Kenny Guy [Wed, 18 Jan 2017 17:27:10 +0000 (17:27 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a
am:
b275a205af
Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
Kenny Guy [Wed, 18 Jan 2017 17:13:31 +0000 (17:13 +0000)]
Fix issue with saving admins before finishing loading.
am:
f98ed6863a
Change-Id: I7f816c164548df86f9607c86772902efd0d53620
Tucker Sylvestro [Wed, 18 Jan 2017 16:41:54 +0000 (16:41 +0000)]
svc nfc should support watches too am:
1876583bfb
am:
eed0a7bf45
Change-Id: If7f2515750bb74d0c9f3baae9fe0a1fc3eeb36ef
Tucker Sylvestro [Wed, 18 Jan 2017 16:34:58 +0000 (16:34 +0000)]
svc nfc should support watches too
am:
1876583bfb
Change-Id: I9612fbe232ecf883fda2c629438ed55ddb50c468
Tucker Sylvestro [Wed, 18 Jan 2017 16:34:50 +0000 (16:34 +0000)]
svc nfc should support watches too
am:
1876583bfb
Change-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297
Jay [Wed, 18 Jan 2017 15:49:58 +0000 (15:49 +0000)]
Merge "Notify user switch event to NetworkController" am:
1aa24246cf
am:
4ab0e9f824
Change-Id: I51365e12797493e620e3146cc7e25eda8c2065c8
Jay [Wed, 18 Jan 2017 15:43:51 +0000 (15:43 +0000)]
Merge "Notify user switch event to NetworkController"
am:
1aa24246cf
Change-Id: I1c2cefbc0fff7d90a4c2a0314c3697ee198caab5
Treehugger Robot [Wed, 18 Jan 2017 15:32:27 +0000 (15:32 +0000)]
Merge "Notify user switch event to NetworkController"
Tucker Sylvestro [Wed, 14 Dec 2016 19:01:14 +0000 (14:01 -0500)]
svc nfc should support watches too
Check for both FEATURE_NFC and FEATURE_NFC_HOST_CARD_EMULATION in the
"svc nfc" command. Watches may only have the latter, but should still
support the nfc enable/disable command.
See b/
24532713#comment7 for context.
Bug
32386425
Change-Id: I307798f00728c6b437aebfcf58115af7265e3692
Jason Monk [Wed, 18 Jan 2017 15:04:51 +0000 (10:04 -0500)]
Fix build
Test: treehugger
Change-Id: Ic33d5ff2d7845bf4edd81d3e966fce3f0e5956bb
Jason Monk [Wed, 18 Jan 2017 14:24:48 +0000 (14:24 +0000)]
Merge "SystemUI: Add NFC tile" am:
943a52862e
am:
8fbdf116d0
Change-Id: I114a75548444e409d1f72183589c886ca9fbccbd
Jason Monk [Wed, 18 Jan 2017 14:19:48 +0000 (14:19 +0000)]
Merge "SystemUI: Add NFC tile"
am:
943a52862e
Change-Id: Icf68f41a0b930da0b846a9b71da1121ef4987d56
Jason Monk [Wed, 18 Jan 2017 14:07:52 +0000 (14:07 +0000)]
Merge "SystemUI: Add NFC tile"
Tamas Berghammer [Wed, 18 Jan 2017 12:57:56 +0000 (12:57 +0000)]
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
Anas Karbila [Sat, 10 Dec 2016 23:55:02 +0000 (00:55 +0100)]
SystemUI: Add NFC tile
This patch adds a tile for QuickSettings
which controls the setting of NFC.
The drawable is from material.io.
Test: Enable and disable NFC using tile
Change-Id: I7dfaf3a4dca0c01d24be397e43ab131eb9885f62
Signed-off-by: Anas Karbila <anaskarbila@aospa.co>
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Kenny Guy [Tue, 17 Jan 2017 23:33:41 +0000 (23:33 +0000)]
Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug:
34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
(cherry picked from commit
adbda7474cc1968b66e9948aee566dc346e71340)
Paul Duffin [Wed, 18 Jan 2017 11:39:39 +0000 (11:39 +0000)]
Merge "Add legacy-android-test target containing android.test classes" am:
c20518139a am:
78af448c30
am:
2ac0e2a186
Change-Id: I965734e5064fccf08ae676047078632e7a95f3c7
Paul Duffin [Wed, 18 Jan 2017 11:34:39 +0000 (11:34 +0000)]
Merge "Add legacy-android-test target containing android.test classes" am:
c20518139a
am:
78af448c30
Change-Id: I272502ca8504683f5feb4abf345a2665e99da057
Paul Duffin [Wed, 18 Jan 2017 11:30:04 +0000 (11:30 +0000)]
Merge "Add legacy-android-test target containing android.test classes"
am:
c20518139a
Change-Id: I0c591f26a7fe4ebbb89a7fb6ad6b5bb846756c99
Paul Duffin [Wed, 18 Jan 2017 11:19:57 +0000 (11:19 +0000)]
Merge "Add legacy-android-test target containing android.test classes"
Lorenzo Colitti [Wed, 18 Jan 2017 10:29:51 +0000 (10:29 +0000)]
Merge changes from topic 'net-update-mr2-dev-plus-aosp' into nyc-mr2-dev-plus-aosp
* changes:
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
DO NOT MERGE: Add missing dependency.
DO NOT MERGE: Show notification for always-on app VPN
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
DO NOT MERGE: Define API for metering network stats buckets.
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
DO NOT MERGE: [CS] Remove timeout event after first available
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
DO NOT MERGE: Move FakeSettingsProvider to a common location.
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
Hugo Benichi [Wed, 19 Oct 2016 04:48:40 +0000 (13:48 +0900)]
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
Test: manually created a bug report and inspected content.
(cherry picked from commit
51d14cb60793a9a073b8a29ff7875bb518cd7d54)
(cherry picked from commit
5635c270a1bda538181daa260902a59030f084e6)
Change-Id: I612b4ab9431633758d3a7048966c267d20cdfcbe
Lorenzo Colitti [Fri, 9 Dec 2016 05:19:57 +0000 (14:19 +0900)]
DO NOT MERGE: Add missing dependency.
(cherry picked from commit
744b02069d7589dc192b19fac6c3e7d62d02e88a)
Change-Id: I3030cc7a718e99ab129fc14174b6d917b9b8e7fb
Tony Mak [Thu, 30 Jun 2016 10:19:20 +0000 (11:19 +0100)]
DO NOT MERGE: Show notification for always-on app VPN
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.
The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.
Bug:
29123115
(cherry picked from commit
1a405fe300950d6ceae2166fd074b596d8110dbe)
(cherry picked from commit
de7f7d195eec64802b7b6eee819c699f1a7d6951)
Change-Id: I42b4b24e25175bb7628b46a79431d2592644803c
Stephen Chen [Fri, 21 Oct 2016 19:44:26 +0000 (12:44 -0700)]
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
Dependent on ag/
1550196 where API is defined.
Bug:
31015360
Bug:
26545374
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/NetworkStatsTest.java,
other test classes.
(cherry picked from commit
25147878974f82f875062e99cdee85dd33f3f078)
(cherry picked from commit
963e8ddf6d5ea3bc34216fa03fe24402bf13940a)
Change-Id: I79e401fc4159264a075febba82bd8c295b8e677f
Hugo Benichi [Tue, 15 Nov 2016 04:42:34 +0000 (13:42 +0900)]
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.
This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.
Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.
With this change the test has been observed to pass with 100% success
rate over 50000 invocations.
Test: $ runtest frameworks-net
Bug:
32561414
(cherry picked from commit
99c8294ef0c7a720364abb5884063e0a9d1bb5fe)
(cherry picked from commit
53d83d51424a496978d2ff2d86845a2284515712)
Change-Id: I432f90a699dadfef37a5d0a69e25050753340964
Hugo Benichi [Tue, 15 Nov 2016 02:25:52 +0000 (11:25 +0900)]
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.
With these timeouts the test succeeds 100% over 5000 iterations.
When using 150ms for registration timeout, running the test 5000 times
fails 2 times.
When using 30ms for onLost timeout, running the test 5000 times fails
1 times.
In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.
Test: $ runtest frameworks-net
Bug:
32561414
(cherry picked from commit
38be57b438a0c1754091f045317db2049304e16f)
(cherry picked from commit
cbf8ff83a8b342e6ebeaa83794dace3c6d0b1488)
Change-Id: I3caf10025f203156a297c0b522f24768a18accc9
Jeff Sharkey [Fri, 2 Dec 2016 19:17:21 +0000 (12:17 -0700)]
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
Also add logging to measure success/failure details.
Test: builds, boots, and NTP fix obtained
Bug:
32969463
(cherry picked from commit
d3f689bf14a05de735b5cc92dcf20e7226c78690)
(cherry picked from commit
dda938a698a17b2943bbe78f6631a26dedabf28a)
Change-Id: I67e4f54f8f2ec69b6522fbbe06ef196b1084f44a
Stephen Chen [Tue, 18 Oct 2016 23:41:47 +0000 (16:41 -0700)]
DO NOT MERGE: Define API for metering network stats buckets.
This is a continuation of b/
26545374, since now we can also set the
metered bit with NetworkScorer. The tracking of metered state changes
will be implemented in a seperate CL.
Bug:
31015360
Bug:
26545374
Test: N/A
(cherry picked from commit
9ac251d1169639c7b955d63b21e80cbc5c394090)
(cherry picked from commit
dadf6caf9f2a8c360203a3f141a8c1366159ec4d)
Change-Id: I01ebb270c5bf7f2383e8923cce72545ca1bee118
Felipe Leme [Thu, 18 Aug 2016 23:20:01 +0000 (16:20 -0700)]
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
BUG:
30943463
(cherry picked from commit
b8f946dc4b24998f14e28573e452ab13ed533347)
(cherry picked from commit
e4c029918f32f9dacc7e6a1e8102b71f3ca1018c)
Change-Id: I93cdfc8753dcded141732c0587783d1fa2085f5a
Felipe Leme [Mon, 22 Aug 2016 15:50:43 +0000 (08:50 -0700)]
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
BUG:
30839080
BUG:
31007021
(cherry picked from commit
fc7d7a359f800d7320d29055ef3b4b75157aaf13)
(cherry picked from commit
2026ca147b6460807b19c997600315806ecb3197)
Change-Id: I45efc93b40e526467c97d0735289db1404ccd22d
Felipe Leme [Thu, 18 Aug 2016 22:31:45 +0000 (15:31 -0700)]
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
Most tests were failing because due to a null NetworkCapabilities.
Example:
1) testNetworkStatsWifi(com.android.server.net.NetworkStatsServiceTest)
java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.NetworkCapabilities.hasCapability(int)' on a null object reference
at
com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:983)
BUG:
30839080
(cherry picked from commit
574f370c6da52eeffe747248d68ef044617c7bcf)
(cherry picked from commit
77cba4bdf6de8aec02efe0da7e84f17603912b21)
Change-Id: I6eee96178ade6adfc1406e06d5376206ca2420e5
Hugo Benichi [Thu, 13 Oct 2016 07:48:42 +0000 (16:48 +0900)]
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
This patch changes the way that the ConnectivityThread is lazily
instantiated by using the "lazy initialization holder class idiom".
The first code point that tries to obtain a reference to the unique
ConnectivityThread instance will trigger the creation of the Singleton
class, which will guarantee a thread-safe initialization of the static
INSTANCE field inside Singleton according to the language specs.
This is the Item #71 of Effective Java.
The unique static instance of ConnectivityThread is not stored directly
inside ConnectivityThread class but is stored in a static nested class.
This is to avoid triggering the creation of that unique instance when
Zygote does class preloading at phone startup. Otherwise this would lead
to Zygote creating a new OS thread during preloading, which is a fatal
error.
Test: frameworks-wifi tests pass
Bug:
26749700
Bug:
28537383
Bug:
32130437
(cherry picked from commit
c4fe5d373caa9f53686e4d58e61394dd40558957)
(cherry picked from commit
ce765b7a51d9452aaa32e43bedeefb7ad200df52)
Change-Id: Ic9a31809ef19e618246f9aa17f5df29bd65f8510
Hugo Benichi [Thu, 7 Jul 2016 01:15:56 +0000 (10:15 +0900)]
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
This patch removes the static singleton looper used by
ConnectivityManager and instead uses the common ConnectivityThread.
This allows to removes the static atomic counter used to track
the number of registered NetworkCallback in ConnectivityManager, because
the looper is not turned off anymore when no callbacks are registered.
Also an overloaded version of sendRequestForNetwork is added taking as a
new parameter a Handler. This will allow to overload various callback
and request related API calls with user provided Handlers.
Test: ConnectivityServiceTest passes
Bug:
26749700
Bug:
28537383
Bug:
32130437
(cherry picked from commit
7724cdd8b90006c852644d06cf6c8a28450c71c6)
(cherry picked from commit
1853f78d768dc44efdc8576302b382ff81a0ffac)
Change-Id: If5c1e46ca6c4a09ef526cbe09654c5f55ef8d6ce
Hugo Benichi [Wed, 6 Jul 2016 13:53:17 +0000 (22:53 +0900)]
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
This patch simplifies CallbackHandler in the following way:
- CallbackHandler directly uses the static references to
sNetworkCallback and sCallbackRefCount. This allows to remove
instance fields in CallbackHandler.
- CallbackHandler does not have a reference to ConnectivityManager
anymore
- CallbackHandler.getObject() is now generic in a type-safe way.
Test: ConnectivityServiceTest passes
Bug:
28537383
Bug:
32130437
(cherry picked from commit
d42650faaa33ec6274278c65a6042228555ddd4f)
(cherry picked from commit
4983e55853db9f9d1cc5720970c439b976480c52)
Change-Id: I4d0b2441b6af76bc56b19218210a2a381532a3c4
Philip P. Moltmann [Mon, 18 Apr 2016 23:23:06 +0000 (16:23 -0700)]
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
Fixes:
28530428
(cherry picked from commit
7d5da4b044183826ac8388c8bdb94ac979a81797)
(cherry picked from commit
29154b000f1dfa6d7bd6a12359f439770463ce3e)
Change-Id: Ib8f8da947af804c8b203928e57ed6a8aedbf0684
Jeremy Klein [Sun, 13 Mar 2016 00:29:54 +0000 (16:29 -0800)]
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
This avoids a NullPointerException when trying to call the callback
and gives a more readable error message.
(cherry picked from commit
5f277e1667b49976a77c9fa79b9a04d775f3b49e)
(cherry picked from commit
c8e4cc8e9919260dac5f2f8a76b693e8a29bfcc1)
Change-Id: Ia5f328c4b25aa6624dc3c8493eb0c7bbab99904c
Etan Cohen [Thu, 27 Oct 2016 22:05:50 +0000 (15:05 -0700)]
DO NOT MERGE: [CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.
Bug:
31402633
Test: all timeout related unit tests pass (new one added)
(cherry picked from commit
681fcda5896fd6c94f8a543ef9983c0a0644e87e)
(cherry picked from commit
bf3b1bad15f45033d409669ac20e4b4e597065fd)
Change-Id: I0cf1a2b7d25bc9912e03fca30621809a9071396c
Hugo Benichi [Wed, 2 Nov 2016 04:43:22 +0000 (13:43 +0900)]
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
Test methods not tagged with @{Small,Medium,Large}Test will not appear
in the Android Platform Continuous Testing dashboard.
Test methods tagged with @LargeTest will not be run in the Android
Platform Continuous Testing dashboard.
Test: ApfTest passes ($runtest frameworks-net)
Bug:
31479480
(cherry picked from commit
4195c28347cc100954f83c3c92b4dde4673f8608)
(cherry picked from commit
5d2654124e9e77dbda102a4435595c552cbc8e36)
Change-Id: Id718e8a02f8db96ff8babac3ec54192148f7bbbd
Lorenzo Colitti [Fri, 28 Oct 2016 08:45:55 +0000 (17:45 +0900)]
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
This was broken by the implementation of IPv6 tethering, which
relies on various private classes which end up calling unmockable
final classes like NetworkInterface.
Making everything public like this is almost certainly not the
best way of fixing this test, but on the other hand there is
value to the test continuing to pass.
Test: runtest frameworks-net # Everything passes.
Test: IPv6 tethering continues to work.
(cherry picked from commit
7e0eeca8ba4063d0d35dda9a8dfcc612e45efb87)
(cherry picked from commit
5bce5a16b17498981253d7a2d1a490667cd71798)
Change-Id: I3f399188f77fe3e5249443dcb61018a22c29d857
Lorenzo Colitti [Fri, 28 Oct 2016 03:48:36 +0000 (12:48 +0900)]
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.
Fix:
31479480
Test: adb shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner' # PASS
(cherry picked from commit
ecc986d430f4b8158f177ed97d2edb741f11ff71)
Change-Id: I4c417c2ba0747d2085169e47ae4a99e93c4d8814
Lorenzo Colitti [Fri, 28 Oct 2016 03:56:03 +0000 (12:56 +0900)]
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
Removing the static dependency on guava reduces test compile time
by about 20 seconds on a Z840, thus substantially speeding up the
compile/test cycle.
Make FutureIntent public instead of package-private because it is
used directly by NetworkPolicyManagementServiceTest, which as of
this CL is now in a different package.
(cherry picked from commit
281a17c9580de5c9898be7d9654d428801976511)
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.NetworkPolicyManagerServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.net.NetworkStatsServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.NetworkManagementServiceTest # Already failing.
Bug:
31479480
(cherry picked from commit
3c295b59f5767904656235db48692906148ab631)
Change-Id: I8a95d4618dced81f173d2b38b9c1dfe3860b348a
Lorenzo Colitti [Fri, 28 Oct 2016 03:37:38 +0000 (12:37 +0900)]
DO NOT MERGE: Move FakeSettingsProvider to a common location.
(cherry picked from commit
7df1a82802cdf842d07a86a80383c7d5ea7ae53a)
Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest
Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest
Bug:
31479480
(cherry picked from commit
b8df76e413d0b8235d0bd71adf8f368f00391fcb)
Change-Id: Ib82b162f354b8cbb521bc0783556f3225b4d12ac
Hugo Benichi [Mon, 17 Oct 2016 06:54:51 +0000 (15:54 +0900)]
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
This patch extracts into its own independent test a test sub-block looking
for a race condition when not waiting on handlers to become idle:
there is no way to prevent the race from not happening when looking for
it this way. This makes the test flakky.
This new independent test is tagged with @FlakkyTest(tolerance = 3).
Test: ConnectivityServiceTest passes, with higher probability.
Bug:
31479480
(cherry picked from commit
c8c1027762d66c12c9c153ccbb8f80acdee8571c)
Change-Id: I32632bb763585c23f1de5bb1811a384a35bf9f64
Hugo Benichi [Thu, 6 Oct 2016 06:19:36 +0000 (15:19 +0900)]
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
Test: added new unit tests
(cherry picked from commit
8acea76a2b7555b3bd5ca1170cca9d09e979fafc)
Change-Id: I4e6633984075d87c4e22466bc881629436359f7f
Erik Kline [Wed, 25 Nov 2015 03:49:38 +0000 (12:49 +0900)]
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
(cherry-pick of
06c3ef1367e850746eef0a5462bdce8674d74c30)
(cherry picked from commit
57faba9ec73fbb311d5ca1df3278aee9728589d5)
Bug:
21414325
(cherry picked from commit
3841a48d0a093bbbd6ffe6338170e1e2dbc11997)
Change-Id: I640c43315a071ecbf881e5ce898164915e0b787f
Narayan Kamath [Wed, 18 Jan 2017 10:04:10 +0000 (10:04 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)." am:
71b1d50531 am:
ec667adb56
am:
aa90336510
Change-Id: I1e0f760ea4ddc5cac238c17a8cf2e53b40706af9
Narayan Kamath [Wed, 18 Jan 2017 09:59:09 +0000 (09:59 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)." am:
71b1d50531
am:
ec667adb56
Change-Id: I73976eab1d344763582caeb6ef9ee6881986472b
Narayan Kamath [Wed, 18 Jan 2017 09:53:09 +0000 (09:53 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)."
am:
71b1d50531
Change-Id: I4813654889a3a088cf8ee5dae0c5655aa520c341
Erik Kline [Wed, 18 Jan 2017 09:51:31 +0000 (09:51 +0000)]
Merge "Restore legacy types when registering mobile requests" am:
85f67dc60a am:
47453e01cb
am:
1a1a7f6e75
Change-Id: I9eb1ca8a19cca3a28e81392dbd988e5c2cee02c7
Narayan Kamath [Wed, 18 Jan 2017 09:46:15 +0000 (09:46 +0000)]
Merge "API: Unhide MethodHandles API (java.lang.invoke)."
Erik Kline [Wed, 18 Jan 2017 09:46:06 +0000 (09:46 +0000)]
Merge "Restore legacy types when registering mobile requests" am:
85f67dc60a
am:
47453e01cb
Change-Id: Ic849eb5f85fd835fe4615f5a22afec3e569cf005
Erik Kline [Wed, 18 Jan 2017 09:41:00 +0000 (09:41 +0000)]
Merge "Restore legacy types when registering mobile requests"
am:
85f67dc60a
Change-Id: I124d28e85711f81216e552bb93dd1994081c9452
Treehugger Robot [Wed, 18 Jan 2017 09:34:36 +0000 (09:34 +0000)]
Merge "Restore legacy types when registering mobile requests"