Automerger Merge Worker
34b9bc5cfd
Merge "Clean up unit testing for ConnectivityDiagnostics." am: 01f0a15807 am: d9d7d4666f am: 146c358e5a
...
Change-Id: I1364751dccc30051aaacf91ad09265d2efbec759
2020-03-16 20:12:32 +00:00
Automerger Merge Worker
146c358e5a
Merge "Clean up unit testing for ConnectivityDiagnostics." am: 01f0a15807 am: d9d7d4666f
...
Change-Id: Idb2167c10f18e3d551a653483ba9ea344b872b87
2020-03-16 20:09:39 +00:00
Automerger Merge Worker
d9d7d4666f
Merge "Clean up unit testing for ConnectivityDiagnostics." am: 01f0a15807
...
Change-Id: Idb4019968a3b3689f1aaddb5e59f3c609890104e
2020-03-16 19:52:06 +00:00
Cody Kesting
01f0a15807
Merge "Clean up unit testing for ConnectivityDiagnostics."
2020-03-16 19:33:33 +00:00
Automerger Merge Worker
3c415ee993
Merge "Add support for registering test networks with administrators." am: ed4de26836 am: 6fbb503d34 am: c865f84b76
...
Change-Id: I95ecd74a8c2462e00deb84a43260bcbe3d189a09
2020-03-16 18:43:18 +00:00
Automerger Merge Worker
c865f84b76
Merge "Add support for registering test networks with administrators." am: ed4de26836 am: 6fbb503d34
...
Change-Id: Ib10e5f0e1b564a4dd8e5ae0bd4032741dcd4e2bb
2020-03-16 18:32:43 +00:00
Automerger Merge Worker
6fbb503d34
Merge "Add support for registering test networks with administrators." am: ed4de26836
...
Change-Id: Ic6251b26fbbce029063d3f83c4fa6dbc4d01df40
2020-03-16 18:18:59 +00:00
Cody Kesting
ed4de26836
Merge "Add support for registering test networks with administrators."
2020-03-16 18:02:55 +00:00
Automerger Merge Worker
747fb87ef3
[automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 6e7c9fd3f1 am: f2fa6b6c23 -s ours am: 781ca6e569 -s ours
...
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 04aca231be is in history
Change-Id: Icb70db29cdb11297ef40befa92f26aa4a076b571
2020-03-16 17:55:43 +00:00
Automerger Merge Worker
781ca6e569
[automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 6e7c9fd3f1 am: f2fa6b6c23 -s ours
...
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 04aca231be is in history
Change-Id: I0186fe6a3dea5c9f955ea12e97c36d9f08b6ffac
2020-03-16 17:42:40 +00:00
Automerger Merge Worker
f2fa6b6c23
Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 6e7c9fd3f1
...
Change-Id: Ibcfc11f90c8caa34954db73f668ca35a34c50e8d
2020-03-16 17:27:39 +00:00
Cody Kesting
6e7c9fd3f1
Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
2020-03-16 17:11:54 +00:00
Automerger Merge Worker
a2f3198127
Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448 am: d2a5f8e2e4
...
Change-Id: Icf0eaaf65f10c47cccfde84c9bd5e66aa27751ee
2020-03-16 16:40:32 +00:00
Automerger Merge Worker
862f520d22
Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448 am: 940f298248
...
Change-Id: I58e302b273bf15e6795ea84dc1f0f9dfb3bb3854
2020-03-16 16:40:00 +00:00
Automerger Merge Worker
940f298248
Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448
...
Change-Id: Id010c4fb6386722666d979c973f26b9d4d0e6cdf
2020-03-16 16:27:57 +00:00
Automerger Merge Worker
d2a5f8e2e4
Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev am: f7da86d448
...
Change-Id: I8f54bd5dcbca8c1c0e4477209feebebfe2b4a6ea
2020-03-16 16:27:43 +00:00
TreeHugger Robot
f7da86d448
Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev
2020-03-16 16:23:23 +00:00
Automerger Merge Worker
21bcc4b11a
[automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba -s ours am: 47417e1348 -s ours
...
am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 ca0cbf817b is in history
Change-Id: I7e6f49c7bd7052110c4ca1b738fb7562341b7788
2020-03-16 16:11:17 +00:00
Automerger Merge Worker
28c49d1f2c
[automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba am: 44778f4e42 -s ours
...
am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 950f4effa6 is in history
Change-Id: I02a3b5437b52d1873a6d0507ba04e3b07aae143d
2020-03-16 16:10:14 +00:00
Automerger Merge Worker
44778f4e42
Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba
...
Change-Id: Icf694f44f543756e117e5eb18f0c46a15fa517ed
2020-03-16 15:56:46 +00:00
Automerger Merge Worker
47417e1348
[automerger skipped] Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev am: bbc723d9ba -s ours
...
am skip reason: Change-Id Ib08f05562dd4b17973eeee97452d9f56d37e80fe with SHA-1 950f4effa6 is in history
Change-Id: I7c764ef28caba3a515fca36f3fe0171d055aeae3
2020-03-16 15:56:09 +00:00
Cody Kesting
bbc723d9ba
Merge "Update Javadoc comments for ConnectivityDiagnostics constants." into rvc-dev
2020-03-16 15:39:43 +00:00
Automerger Merge Worker
d661dfc1ea
Merge "Protect ConnectivityService from SecurityException in permission check." am: 4427f0d106 am: 64e66d2c0b am: 6f19d43a09
...
Change-Id: I35c9c3c197f47be241a9a0839ee9bf8ac9b332df
2020-03-16 15:10:34 +00:00
Automerger Merge Worker
6f19d43a09
Merge "Protect ConnectivityService from SecurityException in permission check." am: 4427f0d106 am: 64e66d2c0b
...
Change-Id: Ia3bda6925daf06b762e6c926bea1b6ff4e640e58
2020-03-16 14:54:02 +00:00
Automerger Merge Worker
64e66d2c0b
Merge "Protect ConnectivityService from SecurityException in permission check." am: 4427f0d106
...
Change-Id: I30d993e431b9d6486dcaebdc48c525a861301f70
2020-03-16 14:47:49 +00:00
Cody Kesting
4427f0d106
Merge "Protect ConnectivityService from SecurityException in permission check."
2020-03-16 14:33:25 +00:00
Automerger Merge Worker
f824f46273
Merge changes I801ddc49,Id1b8f41b am: ba350f4652 am: eb5baeccd9 am: 2457b33e6d
...
Change-Id: Ie5583f070e850f167a0f8fee1c082a998c0ce572
2020-03-16 12:07:38 +00:00
Automerger Merge Worker
2457b33e6d
Merge changes I801ddc49,Id1b8f41b am: ba350f4652 am: eb5baeccd9
...
Change-Id: Ib25ca9a843f19fb3791afbe23c065a0a7bb3b11f
2020-03-16 11:56:41 +00:00
Automerger Merge Worker
eb5baeccd9
Merge changes I801ddc49,Id1b8f41b am: ba350f4652
...
Change-Id: I604bcfab22d7b26b84bf126d02d9be612fcb6d29
2020-03-16 11:41:19 +00:00
Automerger Merge Worker
e1dc4eceb0
[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff -s ours am: a4b26a1dcd -s ours
...
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 46b1d18fc5 is in history
Change-Id: Id9777ff826cedcbb3affb07a8c3f21a6af6a4ade
2020-03-16 10:05:44 +00:00
Automerger Merge Worker
d969083ace
[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff am: 94a4abe30b -s ours
...
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 aae21605af is in history
Change-Id: I3a6d982e29700b478ae507083a40e08a42f26f22
2020-03-16 10:05:31 +00:00
Automerger Merge Worker
a4b26a1dcd
[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff -s ours
...
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 aae21605af is in history
Change-Id: I90422f29362f90c43c4f32857b0f8a09f932731d
2020-03-16 10:00:42 +00:00
Automerger Merge Worker
94a4abe30b
Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff
...
Change-Id: I2416902c665063f6ce6d59c5105d974f4075876d
2020-03-16 10:00:31 +00:00
Automerger Merge Worker
46b1d18fc5
Add test for getDeprecationTime and getExpirationTime
...
Add for cts coverage for system API
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
Change-Id: I64cd2c914f2da71383af7cdef2cf64c60a7d268c
Merged-In: I64cd2c914f2da71383af7cdef2cf64c60a7d268c
(cherry picked from commit 1e7f68f39c0855a45dbf4eeecbff430a2f6f3396)
2020-03-16 08:04:19 +00:00
junyulai
2521ad7386
[SP24] Rename functions that add Entry unconditionally
...
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.
Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record unconditionally,
name them insertEntry.
setIfaceValues -> insertEntry
addEntry -> insertEntry
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: I801ddc49e283a254b9586700c9b597c0adb0d459
2020-03-16 14:27:45 +08:00
Automerger Merge Worker
66aad33efd
[automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 am: d11c52b585 -s ours
...
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 ef12b64147 is in history
Change-Id: I11cca0bed3a3424b92ff7ed155ca729cef37135e
2020-03-16 06:08:15 +00:00
Automerger Merge Worker
8484d92f7d
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 am: b464fd2143
...
Change-Id: I028e1c3f4d0ea78669f2b8a4188a0d4064dfa007
2020-03-16 06:08:04 +00:00
Automerger Merge Worker
12a828d5f3
[automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 -s ours am: 1db8a8251f -s ours
...
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 4493983bbd is in history
Change-Id: I96b83022f7ef1e9e4f12fdd806d62da5e1f08738
2020-03-16 06:03:38 +00:00
Automerger Merge Worker
57b9e58b89
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 am: 86fbb8231c
...
Change-Id: I2812019cd89e700adeb3a5e79bf18d8d9985026b
2020-03-16 06:03:30 +00:00
Automerger Merge Worker
d11c52b585
Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2
...
Change-Id: Ic5103cf650dc16a2d6dd7ace1f25386175a27b0c
2020-03-16 05:54:09 +00:00
Automerger Merge Worker
b464fd2143
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21
...
Change-Id: I1c34bf3459158578949ad665fcce3cff7d15e353
2020-03-16 05:53:53 +00:00
Automerger Merge Worker
1db8a8251f
[automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 -s ours
...
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 4493983bbd is in history
Change-Id: I0a46cc19cb5cfb0a90a96299f48195ab2e2c836f
2020-03-16 05:53:38 +00:00
Automerger Merge Worker
86fbb8231c
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21
...
Change-Id: I72f00d09e74eb0de1d837a29a2b869a4de45178d
2020-03-16 05:53:15 +00:00
Paul Hu
46a3b708b2
Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev
2020-03-16 05:48:33 +00:00
Aaron Huang
eb93e7de21
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev
2020-03-16 05:47:34 +00:00
Automerger Merge Worker
f408ea33ff
Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 am: 36b22b0180 am: 77f57ba2c0
...
Change-Id: I5c77bcd0a95e51c91c306981c5f396f445da5ab8
2020-03-16 03:39:33 +00:00
Automerger Merge Worker
15ac97e669
[SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 am: 893301ab1e am: ceb5fe6225
...
Change-Id: I9c44371665dc09612357a5ef880364bc32824784
2020-03-16 03:39:03 +00:00
Automerger Merge Worker
77f57ba2c0
Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 am: 36b22b0180
...
Change-Id: Ic4d1d7f7ce4bf8c6bf03fbe1da57216a8179bca9
2020-03-16 03:14:45 +00:00
Automerger Merge Worker
ceb5fe6225
[SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 am: 893301ab1e
...
Change-Id: I86cf3b57722f64c0989ce606fde71d6173f812bb
2020-03-16 03:14:01 +00:00
Automerger Merge Worker
36b22b0180
Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3
...
Change-Id: Ief866c87b9e69b892fca435e8555080ffdad4af7
2020-03-16 03:05:06 +00:00