Commit Graph

281719 Commits

Author SHA1 Message Date
Tamas Berghammer
d331d57dc6 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
2017-01-18 20:32:44 +00:00
Tamas Berghammer
0a1a0e6e61 DO NOT MERGE: Revert "Fix build"
am: a0a908f5d6

Change-Id: I3ba66290b49fbe184eff424f5e70b8f32ed6fb3e
2017-01-18 20:23:54 +00:00
Tamas Berghammer
572dfccfc1 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: 24d8553316  -s ours

Change-Id: I09a58385e10e135af06dff346624dcbc9eb76a4f
2017-01-18 20:22:57 +00:00
Tamas Berghammer
b4050d8042 Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp 2017-01-18 19:59:59 +00:00
Tamas Berghammer
a0a908f5d6 DO NOT MERGE: Revert "Fix build"
This reverts commit 005055c070.

Change-Id: Ia71d1e95de48bc1d83a4924041953a2d42ed6a93
2017-01-18 19:35:07 +00:00
Tamas Berghammer
24d8553316 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit cbd3f0c59a.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
2017-01-18 19:33:22 +00:00
Glen Kuhne
424650dd52 Merge "Unhide WifiConfiguration proxy accessors" am: c82d1ddaf4 am: d2f5fd3c42
am: 878fcfaa22

Change-Id: Ib4a59d41088ba00b21ccaeea6a9e7578c24ab8da
2017-01-18 18:57:40 +00:00
Kenny Guy
7ede74bb06 Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed am: 1894632864
am: c8a6eb1382

Change-Id: I8c6af06495a4a4b4687c235c904e2a2d7d1480bc
2017-01-18 18:55:17 +00:00
Tucker Sylvestro
9ece7d4509 svc nfc should support watches too am: 1876583bfb
am: baa26e2d3d

Change-Id: I14f715f5b6937e7f2c5fb55a69fbeb750e31186b
2017-01-18 18:54:12 +00:00
Jay
bddba11564 Merge "Notify user switch event to NetworkController" am: 1aa24246cf am: 4ab0e9f824
am: 3f326e7011

Change-Id: I9a844a8bf1fb7bc3cfabc0832e7fb532278cda99
2017-01-18 18:53:20 +00:00
Jason Monk
655c5066c7 Fix build
am: 005055c070

Change-Id: Ica900e6a6e7413408ac5d79dedfcf41526011be0
2017-01-18 18:52:14 +00:00
Jason Monk
8cff199b09 resolve merge conflicts of 54bce9c6ff to nyc-mr2-dev-plus-aosp
Change-Id: Ifaea1d0f58ea81a7d929dc891fe69c8d7c15af4e
2017-01-18 13:45:59 -05:00
Glen Kuhne
878fcfaa22 Merge "Unhide WifiConfiguration proxy accessors" am: c82d1ddaf4
am: d2f5fd3c42

Change-Id: I20fbec10c7a3355d80a305583308095954ff5488
2017-01-18 18:25:52 +00:00
Glen Kuhne
d2f5fd3c42 Merge "Unhide WifiConfiguration proxy accessors"
am: c82d1ddaf4

Change-Id: I12e44cf9c75f76712eb2c89fbd878a7cb74ec8a9
2017-01-18 18:20:43 +00:00
Glen Kuhne
c82d1ddaf4 Merge "Unhide WifiConfiguration proxy accessors" 2017-01-18 18:08:36 +00:00
Tamas Berghammer
1a2a860d2c Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
am: 3db5d42f90

Change-Id: Ia944e535f7329c32bf34770fb0d99019cc1091f9
2017-01-18 18:06:43 +00:00
Android Build Merger (Role)
391ab8caaa Merge "Update package names to work with the proto3 compiler am: cbd3f0c59a -s ours" into nyc-mr2-dev-plus-aosp 2017-01-18 18:02:05 +00:00
Kenny Guy
7f00eb6e90 Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed am: 1894632864
am: 748e78bd2c

Change-Id: I6d8c1b6e6f6b171527fa48bf477926a31aa5aacf
2017-01-18 17:55:04 +00:00
Kenny Guy
c8a6eb1382 Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed
am: 1894632864

Change-Id: I10ed70e5aef941dd7b31f381f78eb8418985f33c
2017-01-18 17:47:03 +00:00
Kenny Guy
748e78bd2c Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed
am: 1894632864

Change-Id: I4328578f929875fd59f48681b8ae2c7c4d3bd623
2017-01-18 17:47:02 +00:00
Tamas Berghammer
2c8d6c4c39 Update package names to work with the proto3 compiler
am: cbd3f0c59a  -s ours

Change-Id: I8c957a9ad00cb393dbaaa05bec9730cc3a84a94e
2017-01-18 17:44:23 +00:00
Kenny Guy
1894632864 Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af
am: ee9f03d1ed

Change-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05
2017-01-18 17:33:33 +00:00
Kenny Guy
ee9f03d1ed Fix issue with saving admins before finishing loading. am: f98ed6863a
am: b275a205af

Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
2017-01-18 17:27:10 +00:00
Kenny Guy
b275a205af Fix issue with saving admins before finishing loading.
am: f98ed6863a

Change-Id: I7f816c164548df86f9607c86772902efd0d53620
2017-01-18 17:13:31 +00:00
Tucker Sylvestro
93591413eb svc nfc should support watches too am: 1876583bfb
am: eed0a7bf45

Change-Id: If7f2515750bb74d0c9f3baae9fe0a1fc3eeb36ef
2017-01-18 16:41:54 +00:00
Tucker Sylvestro
baa26e2d3d svc nfc should support watches too
am: 1876583bfb

Change-Id: I9612fbe232ecf883fda2c629438ed55ddb50c468
2017-01-18 16:34:58 +00:00
Tucker Sylvestro
eed0a7bf45 svc nfc should support watches too
am: 1876583bfb

Change-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297
2017-01-18 16:34:50 +00:00
Jay
3f326e7011 Merge "Notify user switch event to NetworkController" am: 1aa24246cf
am: 4ab0e9f824

Change-Id: I51365e12797493e620e3146cc7e25eda8c2065c8
2017-01-18 15:49:58 +00:00
Jay
4ab0e9f824 Merge "Notify user switch event to NetworkController"
am: 1aa24246cf

Change-Id: I1c2cefbc0fff7d90a4c2a0314c3697ee198caab5
2017-01-18 15:43:51 +00:00
Treehugger Robot
1aa24246cf Merge "Notify user switch event to NetworkController" 2017-01-18 15:32:28 +00:00
Tucker Sylvestro
1876583bfb 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
2017-01-18 10:27:38 -05:00
Jason Monk
005055c070 Fix build
Test: treehugger
Change-Id: Ic33d5ff2d7845bf4edd81d3e966fce3f0e5956bb
2017-01-18 10:04:51 -05:00
Jason Monk
54bce9c6ff Merge "SystemUI: Add NFC tile" am: 943a52862e
am: 8fbdf116d0

Change-Id: I114a75548444e409d1f72183589c886ca9fbccbd
2017-01-18 14:24:48 +00:00
Jason Monk
8fbdf116d0 Merge "SystemUI: Add NFC tile"
am: 943a52862e

Change-Id: Icf68f41a0b930da0b846a9b71da1121ef4987d56
2017-01-18 14:19:48 +00:00
Jason Monk
943a52862e Merge "SystemUI: Add NFC tile" 2017-01-18 14:07:53 +00:00
Tamas Berghammer
3db5d42f90 Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp 2017-01-18 12:58:01 +00:00
Anas Karbila
f7648f4483 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>
2017-01-18 12:12:03 +00:00
Kenny Guy
f98ed6863a 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 adbda7474c)
2017-01-18 12:01:55 +00:00
Paul Duffin
93a897b3db Merge "Add legacy-android-test target containing android.test classes" am: c20518139a am: 78af448c30
am: 2ac0e2a186

Change-Id: I965734e5064fccf08ae676047078632e7a95f3c7
2017-01-18 11:39:39 +00:00
Paul Duffin
2ac0e2a186 Merge "Add legacy-android-test target containing android.test classes" am: c20518139a
am: 78af448c30

Change-Id: I272502ca8504683f5feb4abf345a2665e99da057
2017-01-18 11:34:39 +00:00
Paul Duffin
78af448c30 Merge "Add legacy-android-test target containing android.test classes"
am: c20518139a

Change-Id: I0c591f26a7fe4ebbb89a7fb6ad6b5bb846756c99
2017-01-18 11:30:04 +00:00
Paul Duffin
c20518139a Merge "Add legacy-android-test target containing android.test classes" 2017-01-18 11:19:58 +00:00
Lorenzo Colitti
5db17efcf6 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.
2017-01-18 10:29:57 +00:00
Hugo Benichi
7a61361724 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 51d14cb607)

(cherry picked from commit 5635c270a1)

Change-Id: I612b4ab9431633758d3a7048966c267d20cdfcbe
2017-01-18 19:08:48 +09:00
Lorenzo Colitti
d9409d3b60 DO NOT MERGE: Add missing dependency.
(cherry picked from commit 744b02069d)

Change-Id: I3030cc7a718e99ab129fc14174b6d917b9b8e7fb
2017-01-18 19:08:46 +09:00
Tony Mak
b31b83377b 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 1a405fe300)

(cherry picked from commit de7f7d195e)

Change-Id: I42b4b24e25175bb7628b46a79431d2592644803c
2017-01-18 19:08:44 +09:00
Stephen Chen
c926b7399a 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 2514787897)

(cherry picked from commit 963e8ddf6d)

Change-Id: I79e401fc4159264a075febba82bd8c295b8e677f
2017-01-18 19:08:41 +09:00
Hugo Benichi
bccd8ad00a 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 99c8294ef0)

(cherry picked from commit 53d83d5142)

Change-Id: I432f90a699dadfef37a5d0a69e25050753340964
2017-01-18 19:08:39 +09:00
Hugo Benichi
de7002ef0d 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 38be57b438)

(cherry picked from commit cbf8ff83a8)

Change-Id: I3caf10025f203156a297c0b522f24768a18accc9
2017-01-18 19:08:37 +09:00
Jeff Sharkey
389b853bc8 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 d3f689bf14)

(cherry picked from commit dda938a698)

Change-Id: I67e4f54f8f2ec69b6522fbbe06ef196b1084f44a
2017-01-18 19:08:35 +09:00