Commit Graph

5906 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
94aebc6bc6 Merge "Add documentation for CaptivePortal APP_RETURN_*" am: a15a1c53d5
am: d623ba8571

Change-Id: I1e14b2d2d5f49980601f2e75eeffc992997de3f5
2019-03-19 23:02:52 -07:00
Remi NGUYEN VAN
d623ba8571 Merge "Add documentation for CaptivePortal APP_RETURN_*"
am: a15a1c53d5

Change-Id: Idc55c5c729e2a66ad845dbc8ddaf97580c7ae8cc
2019-03-19 22:53:43 -07:00
Remi NGUYEN VAN
a15a1c53d5 Merge "Add documentation for CaptivePortal APP_RETURN_*" 2019-03-20 05:40:41 +00:00
Remi NGUYEN VAN
887c5f639d Merge "Add Parcelable implementation for ApfCapabilities" am: 9a35341fe2
am: 78d8ff6bf8

Change-Id: Iecec6a6376e2ff64d24813dbdb5b958f6968d627
2019-03-19 17:59:22 -07:00
Remi NGUYEN VAN
78d8ff6bf8 Merge "Add Parcelable implementation for ApfCapabilities"
am: 9a35341fe2

Change-Id: I218b583755259a8c0824777c3247a090bdbd348b
2019-03-19 17:51:34 -07:00
Remi NGUYEN VAN
9a35341fe2 Merge "Add Parcelable implementation for ApfCapabilities" 2019-03-20 00:34:53 +00:00
Chenbo Feng
273632beed Merge "Add uid information in PackageListObserver" am: 63e0701ecb
am: b6972b2566

Change-Id: I61f46bf443c2027ed70a884f0cbb3ede80a8c1f3
2019-03-19 14:53:10 -07:00
Chenbo Feng
b6972b2566 Merge "Add uid information in PackageListObserver"
am: 63e0701ecb

Change-Id: I4fef26fed802902d6a69563c19704a94916ff834
2019-03-19 14:42:14 -07:00
Treehugger Robot
63e0701ecb Merge "Add uid information in PackageListObserver" 2019-03-19 21:19:16 +00:00
Varun Anand
fefcada377 Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 0572cf6752
am: 42db9375aa

Change-Id: I7ab73884266bc4b64d1914557a29e84fc4de431e
2019-03-19 09:37:37 -07:00
Varun Anand
42db9375aa Merge "Add unit tests related to data accounting for VPNs with one underlying network."
am: 0572cf6752

Change-Id: I91971112870c7a3a2d4786c25125204de7e008f5
2019-03-19 09:28:22 -07:00
Treehugger Robot
0572cf6752 Merge "Add unit tests related to data accounting for VPNs with one underlying network." 2019-03-19 16:18:28 +00:00
Xiao Ma
f693b45d57 Merge "Move the IpMemoryStore to the network stack." am: 3b3aabfb68
am: e0f77826f7

Change-Id: I20e384320309579b19fe44f3841ffbc49c028c6d
2019-03-19 06:44:45 -07:00
Xiao Ma
e0f77826f7 Merge "Move the IpMemoryStore to the network stack."
am: 3b3aabfb68

Change-Id: I672d07ca2d0a251c246993ab8c7c3075de385570
2019-03-19 06:35:31 -07:00
Xiao Ma
3b3aabfb68 Merge "Move the IpMemoryStore to the network stack." 2019-03-19 13:21:12 +00:00
Remi NGUYEN VAN
cd13f8f3d5 Add documentation for CaptivePortal APP_RETURN_*
This fixes API review requests.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 126883311
Change-Id: I0632a98675e65c5e722e81a2c1e0cf1403b54395
2019-03-19 18:57:44 +09:00
Luke Huang
aef7db0037 Merge "Replace Handler with Executor for async DNS API" am: 44bd665c9e
am: b856fc1410

Change-Id: I40ce45d039e01f831b6f4f50ed360a2a206a1146
2019-03-18 23:25:58 -07:00
Luke Huang
9f9d2e8f02 Merge "Refactor answer callback for async DNS query JAVA API" am: b65af07286
am: 9ddf2c10aa

Change-Id: I7538b247c5bd84d7f5b21be11b9bb1940fb9ba5a
2019-03-18 23:09:58 -07:00
Luke Huang
b856fc1410 Merge "Replace Handler with Executor for async DNS API"
am: 44bd665c9e

Change-Id: I5fb0d659d27894ca9f243654f9283764f1369745
2019-03-18 23:05:15 -07:00
Luke Huang
9ddf2c10aa Merge "Refactor answer callback for async DNS query JAVA API"
am: b65af07286

Change-Id: I26eb642cc04e3804cd82a56e45a890689b3c643f
2019-03-18 22:55:37 -07:00
Luke Huang
44bd665c9e Merge "Replace Handler with Executor for async DNS API" 2019-03-19 05:35:39 +00:00
Luke Huang
b65af07286 Merge "Refactor answer callback for async DNS query JAVA API" 2019-03-19 05:35:18 +00:00
Mark Chien
057dc5b976 Merge "Remove deprecated entitlement API" am: 9d9850ae30
am: c818ace0cc

Change-Id: I6028d1f11f99bf5719f0d2a5b387fe651905aba3
2019-03-18 20:22:09 -07:00
Mark Chien
c818ace0cc Merge "Remove deprecated entitlement API"
am: 9d9850ae30

Change-Id: I6b19b684a1dfa509ee77304d6acfe3fcdb6ca69c
2019-03-18 20:00:35 -07:00
Mark Chien
9d9850ae30 Merge "Remove deprecated entitlement API" 2019-03-19 02:44:37 +00:00
Chenbo Feng
f3e11e733d Add uid information in PackageListObserver
The uid information of a removed package cannot be retrieved by the
packageName anymore once it is removed. So it would be useful to provide
the uid of removed package in the onPackageAdded and onPackageRemoved
method of the PackageListObserver. This modification helps simplify the
design in PermissionMonitor.

Bug: 125396053
Test: dumpsys netd trafficcontroller

Exempt-From-Owner-Approval: Already merged in internal master
Merged-In: I2bd4bdf924687960a4fa3a47235bae68d885e445
Change-Id: I2bd4bdf924687960a4fa3a47235bae68d885e445
2019-03-18 19:32:29 -07:00
Chalard Jean
0727435c56 Move the IpMemoryStore to the network stack.
Test: atest FrameworksNetTests
Change-Id: Ic5bd6ff54b09a6fa92b6863f240a5b053011acb6
2019-03-18 11:33:17 +09:00
Remi NGUYEN VAN
f363d924dc Merge "Remove NetworkParcelable" am: 7391d04a26
am: 7dc93f8a1e

Change-Id: Ice0f04749d2b7c2863ad18c29f5967649127ee0e
2019-03-17 18:55:26 -07:00
Remi NGUYEN VAN
7dc93f8a1e Merge "Remove NetworkParcelable"
am: 7391d04a26

Change-Id: I8dc6d665a33d19ecad2bd5f611c2b68e08d53b97
2019-03-17 18:44:58 -07:00
Remi NGUYEN VAN
7391d04a26 Merge "Remove NetworkParcelable" 2019-03-18 01:30:25 +00:00
Luke Huang
9aa1520d40 Replace Handler with Executor for async DNS API
Bug: 124882626
Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: Ie1dc27643d4767f2a8a39da755edf388a00962d5
2019-03-16 18:53:07 +08:00
Luke Huang
144cd67c38 Refactor answer callback for async DNS query JAVA API
1. refactor AnswerCallback with a generic type
2. support onError in AnswerCallback
3. Fix minor problem reported from API Review

Bug: 124882626
Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: I685c9989f8401acb63d2e83f552b2d5b20c41af0
2019-03-16 18:53:05 +08:00
Varun Anand
e22525bf92 Add unit tests related to data accounting for VPNs with one underlying
network.

This is to establish a baseline for the existing behavior, and to ensure
that following changes are not causing a regression in existing
behavior.

This CL is also adding missing cleanup for NetworkStatsCollectionTest
which was forcing all network types in NetworkTemplate that was causing
NetworkStatsService related tests to fail.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Change-Id: I285f186cfb16bc9fa704c797996b1e4f8a73dee4
2019-03-15 17:23:28 -07:00
Jack Yu
254fad9ee3 Merge "Moved transport to IntDef" am: 7b163381e2
am: 803679947b

Change-Id: I9a68e86efd37018db87dfb09af58fba8b99c3b15
2019-03-15 16:40:23 -07:00
Jack Yu
803679947b Merge "Moved transport to IntDef"
am: 7b163381e2

Change-Id: I80d2bf5b3d195d4b05135006418ba4b638271f4f
2019-03-15 16:31:06 -07:00
Treehugger Robot
7b163381e2 Merge "Moved transport to IntDef" 2019-03-15 23:21:29 +00:00
Remi NGUYEN VAN
633c331167 Remove NetworkParcelable
With the @JavaOnlyStableParcelable annotation, Network can now be used
as-is as a framework parcelable.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 126477266
Change-Id: I5d9695a31b3ac48d10edcf08ccd0c34375353b79
2019-03-16 03:51:09 +09:00
Benedict Wong
feaff7f7b6 Merge "Integrate testNetworkService and Manager with Connectivity stack" am: bc233c9e62
am: 9741d886d9

Change-Id: If9efbc3e0b3f0949286a2a5ad8226009ebbcfc07
2019-03-15 10:59:21 -07:00
Benedict Wong
9741d886d9 Merge "Integrate testNetworkService and Manager with Connectivity stack"
am: bc233c9e62

Change-Id: I571e583d896841c814efe58b8c0875fa9cd3873c
2019-03-15 10:50:06 -07:00
Benedict Wong
bc233c9e62 Merge "Integrate testNetworkService and Manager with Connectivity stack" 2019-03-15 17:41:02 +00:00
markchien
5fe817f59c Remove deprecated entitlement API
The deprecated entitlement APIs[1] is introduced in the Q
development cycle. It should be replaced by new APIs[2][3].

[1] https://android-review.googlesource.com/c/platform/frameworks/base/+/874220
[2] https://android-review.googlesource.com/c/platform/frameworks/base/+/920354
[3] https://android-review.googlesource.com/c/platform/frameworks/base/+/927513

Test: -build, flash, boot
bug: 126701557
bug: 126392011
Change-Id: I96487e9038c07363680a76db840994719d7ff768
2019-03-15 09:03:50 +00:00
Junyu Lai
686be8c9b0 Merge "[KA02.5] Use binder thread and executor to invoke callback" am: f9ae70a41c
am: 750fbd0ab2

Change-Id: I259ff770ce491d9dec5d136202bebf08e6de58e2
2019-03-15 01:10:46 -07:00
Junyu Lai
750fbd0ab2 Merge "[KA02.5] Use binder thread and executor to invoke callback"
am: f9ae70a41c

Change-Id: I892d4f4dc786aa42dcbe565f345e9a731f318c8a
2019-03-15 00:53:55 -07:00
Remi NGUYEN VAN
619010079e Add Parcelable implementation for ApfCapabilities
This is necessary to allow usage of ApfCapabilities as-is in AIDL,
instead of relying on ApfCapabilitiesParcelable, assuming that stable
AIDL starts allowing usage of @SystemApi classes. The Parcelable
implementation would be convenient for clients in any case.

Bug: 126477266
Test: atest FrameworksNetTests
Change-Id: Id2ef3cad261832a2918ccb6bb6bc154d99d75746
2019-03-15 13:41:59 +09:00
Jack Yu
9eda62ac04 Moved transport to IntDef
Moved out from the sub class per API review feedback.

Test: Build
Bug: 128607082
Merged-In: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
Change-Id: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
2019-03-14 20:32:16 -07:00
junyulai
9f87223db2 [KA02.5] Use binder thread and executor to invoke callback
Currently, client side of keepalive event handling rely on a
newly created thread, looper, messenger and handler per object.

However, by creating oneway AIDL interface with the executor,
the callbacks can be invoked on the binder thread with user
specified context, which not only greatly simplify the design
but also reduce the cost of current thread modeling.

Bug: 114151147
Bug: 123969871
Test: 1. atest FrameworksNetTests --generate-new-metric 10
      2. atest-deflake.sh

Change-Id: I27504074cd28d5b5eb94a7ec0e97ebaaaaa1ae3d
2019-03-14 19:24:12 +08:00
Jeremy Klein
3abf3bc260 Merge "Rename entitlement callback to adhere to API guidelines." am: a3c10cd22b
am: b0f9bd21a2

Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68
2019-03-12 23:36:36 -07:00
Jeremy Klein
b0f9bd21a2 Merge "Rename entitlement callback to adhere to API guidelines."
am: a3c10cd22b

Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a
2019-03-12 22:39:53 -07:00
Chalard Jean
c9996fbf4a Merge "Tell the factory it is already serving a request." am: 40f6974c7a
am: 183de75174

Change-Id: I8c89110d3b8d55fb8c516a966f4726d4059a098e
2019-03-12 22:21:24 -07:00
Ian Kasprzak
40088b623f Merge "Temporarily disable flaky test." am: d146d717c7
am: 3bab305ed9

Change-Id: Ice8e6cd6cad901ca937ca0953049c2f9c83548f8
2019-03-12 22:15:44 -07:00