Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
458,611 Commits 3 Branches 0 Tags
b644ae2000f24238041f42c5970371bdcffeb2dd
Commit Graph

4685 Commits

Author SHA1 Message Date
Automerger Merge Worker
c82d176593 Merge "Change tetheroffloadjni to tetheringutilsjni" am: 3e16a10a3e am: 75b0369615 am: ef581020d3 
Change-Id: I2069561edb05b53e565563c8419c689531ff9571
 2020-01-07 09:38:44 +00:00
Automerger Merge Worker
ef581020d3 Merge "Change tetheroffloadjni to tetheringutilsjni" am: 3e16a10a3e am: 75b0369615 
Change-Id: I913f33213bf208ef7733871222e57a21f0d460e6
 2020-01-07 09:25:49 +00:00
Treehugger Robot
3e16a10a3e Merge "Change tetheroffloadjni to tetheringutilsjni" 2020-01-07 09:05:43 +00:00
Automerger Merge Worker
b8bf014c1f Merge "android.net: Update OWNERS." am: 2b89b0c7ca am: d913b9037a am: e2c143c1d8 
Change-Id: I0ada01aecdd91b47ebf3ac8561da0b6afaeaff3f
 2020-01-07 08:34:29 +00:00
Automerger Merge Worker
e2c143c1d8 Merge "android.net: Update OWNERS." am: 2b89b0c7ca am: d913b9037a 
Change-Id: Ie7b5b2fedba3f56e612b0951b27fbb5b12d98e97
 2020-01-07 08:21:36 +00:00
TreeHugger Robot
fab33b6bf5 Merge "Use new UnsupportedAppUsage annotation." 2020-01-07 07:58:18 +00:00
markchien
771c3e9a3d Change tetheroffloadjni to tetheringutilsjni 
Rename tetheroffloadjni to tetheringutilsjni and move setupRaSocket
jni method from NetUtils into tetheringutilsjni.

Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests
      -Off/On hotspot with ipv6 upstream

Change-Id: Ib68eb6999bbe2d3ca97e68712f22b105311ef800
 2020-01-07 07:42:13 +00:00
Treehugger Robot
2b89b0c7ca Merge "android.net: Update OWNERS." 2020-01-07 07:38:36 +00:00
Automerger Merge Worker
11d0a7fb46 Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 am: 1740e8698d 
Change-Id: I826f1f94ea62eb5bd93e5d7edcbe278c8247ae2d
 2020-01-07 07:31:36 +00:00
Automerger Merge Worker
1740e8698d Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
 2020-01-07 07:16:15 +00:00
Lorenzo Colitti
348577e09f Make LinkPropertiesTest pass, and fix an NPE. 
aosp/973686 added the DHCP server address to LinkProperties, but
it did not have any tests, and would throw NPE when parceling a
LinkProperties that did not have a DHCP server.

Add tests and fix the bug.

Bug: 134098566
Test: unit test now passes
Change-Id: If28f0be650963e8d9af7eb53f6940824582a2db3
 2020-01-07 13:02:32 +09:00
Artur Satayev
269580069b Use new UnsupportedAppUsage annotation. 
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
 2020-01-06 16:47:35 +00:00
ruibin zhang
ad2689c1a1 Add the DHCP server address to LinkProperties. 
Bug: 134098566
Test: see subsequent CL in topic
Change-Id: If0f80067934189137c87cd379e7ae47b187562fd
 2020-01-07 01:21:07 +09:00
TreeHugger Robot
30b90101c7 Merge "Add NETWORK_AIRPLANE_MODE permission" 2020-01-06 14:15:46 +00:00
Tobias Thierer
bf7b806fb5 android.net: Update OWNERS. 
Remove flooey@, add prb@ and dauletz@.

Bug: 147092934
Test: Treehugger
Change-Id: I1bdcaf6a2ad3aa66aff23d3488e9426b6d29d29e
 2020-01-02 17:09:10 +00:00
Automerger Merge Worker
2cd16a209a Merge "Make StringNetworkSpecifier @SystemApi" am: fbceb58514 am: a4fbf15adf am: a7d60e5103 
Change-Id: Ia7e749b8953ce16a770dfe2a32e8407c6b22eecd
 2019-12-31 08:43:29 +00:00
Automerger Merge Worker
a7d60e5103 Merge "Make StringNetworkSpecifier @SystemApi" am: fbceb58514 am: a4fbf15adf 
Change-Id: I6b78f5cdbabcacbdb02ff82945c645efd6c74943
 2019-12-31 08:29:05 +00:00
Aaron Huang
fbceb58514 Merge "Make StringNetworkSpecifier @SystemApi" 2019-12-31 08:11:48 +00:00
Automerger Merge Worker
e10e90482a Merge "Expose NetworkCapabilities methods to system/public APIs" am: 30b2ac7158 am: 435b410600 am: 6c14dd9c44 
Change-Id: I6515df858f4ebc94d234f905a659db45188d72c6
 2019-12-27 08:54:24 +00:00
Automerger Merge Worker
6c14dd9c44 Merge "Expose NetworkCapabilities methods to system/public APIs" am: 30b2ac7158 am: 435b410600 
Change-Id: Id97144cf1421f5256748a196df37f58ffd006859
 2019-12-27 08:45:44 +00:00
Aaron Huang
e6b62391da Expose NetworkCapabilities methods to system/public APIs 
Add methods to system/public APIs for mainline support.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
      atest NetworkStackTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest FrameworksTelephonyTests
      atest android.net.cts
      atest android.net.wifi.cts
      atest android.telephony.cts

Change-Id: I6ec333309172edaf5aa976f83cfbe63512043594
 2019-12-27 08:31:06 +00:00
Aaron Huang
743a79e2ba Make StringNetworkSpecifier @SystemApi 
Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I64ffbca6e7cb6494748533257bc63aafb8600317
 2019-12-26 15:51:08 +08:00
Automerger Merge Worker
3fc99ac92f Merge "Make MatchAllNetworkSpecifier constructor @SystemApi" am: 9dd0968ca1 am: 011eb06659 am: 14d9520d80 
Change-Id: Ic2dd94ea3f120b457ade378b87a5c93ee0543155
 2019-12-25 09:32:45 +00:00
Automerger Merge Worker
14d9520d80 Merge "Make MatchAllNetworkSpecifier constructor @SystemApi" am: 9dd0968ca1 am: 011eb06659 
Change-Id: I8d0be2c9deff0f48842f8a3bb3c4a685ffe2e095
 2019-12-25 09:15:35 +00:00
Aaron Huang
9dd0968ca1 Merge "Make MatchAllNetworkSpecifier constructor @SystemApi" 2019-12-25 08:07:00 +00:00
Automerger Merge Worker
08074c62b0 Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: 25cc1f47c5 
Change-Id: I9ec25eb984e3b534ddcc9313836a319b21526998
 2019-12-20 14:00:29 +00:00
markchien
ae8aa646dc [Tether13] Move TetheringManager into framework 
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
 2019-12-20 10:31:31 +08:00
Artur Satayev
c20b82a466 Merge "Use new UnsupportedAppUsage annotation." 2019-12-19 16:55:30 +00:00
markchien
6d06f6d51a [Tether13] Move TetheringManager into framework 
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
Merged-In: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
 2019-12-19 20:53:06 +08:00
Automerger Merge Worker
35990bba96 Merge "Add LinkProperties methods to system APIs" am: 4dba00e007 am: 8d2b81869c am: ae6c84fcb2 
Change-Id: I39e9224206a43a85fecaf0956003cd4896ca0820
 2019-12-19 08:38:26 +00:00
Automerger Merge Worker
ae6c84fcb2 Merge "Add LinkProperties methods to system APIs" am: 4dba00e007 am: 8d2b81869c 
Change-Id: Ie0a102ceb853c9f61d3e1deb369938a48edcdcac
 2019-12-19 08:22:11 +00:00
Aaron Huang
4dba00e007 Merge "Add LinkProperties methods to system APIs" 2019-12-19 08:01:58 +00:00
Aaron Huang
adfdf4da4f Make MatchAllNetworkSpecifier constructor @SystemApi 
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: Ifcd9ad2916c696c99b8fa13632a302d67f4cb58c
 2019-12-19 14:51:15 +08:00
Automerger Merge Worker
bed24cb825 Merge "Fix parceling of LinkProperties Inet6Addr" am: 7382f03d58 am: 50fb44e776 am: 091f1d790c 
Change-Id: I6692a91c3e00fb8726ed4914f7d7e3c22874a068
 2019-12-19 03:46:11 +00:00
Automerger Merge Worker
091f1d790c Merge "Fix parceling of LinkProperties Inet6Addr" am: 7382f03d58 am: 50fb44e776 
Change-Id: Ie5b7782d788717dd1cc440e502d6cdf2d1c18eaa
 2019-12-19 03:29:50 +00:00
Remi NGUYEN VAN
7382f03d58 Merge "Fix parceling of LinkProperties Inet6Addr" 2019-12-19 03:07:43 +00:00
Artur Satayev
afdb23ab6f Use new UnsupportedAppUsage annotation. 
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I534e3fd1305e2f4af076986770033478448a665c
 2019-12-18 20:44:45 +00:00
Remi NGUYEN VAN
f705ea69dc Fix parceling of LinkProperties Inet6Addr 
IPv6 addresses parceled for DNS servers, private DNS servers, PCSCF
servers were parceled without the scope. This causes issues with
link-local DNS servers.

Test: atest FrameworksNetTests
Bug: 145181158
Change-Id: I0ed24e51d4d0656f4a1f932b5e9f646b35b4b971
 2019-12-18 19:52:30 +09:00
Aaron Huang
e6a18182ce Merge "Add keepalive related methods and fields to system APIs" 2019-12-17 13:57:13 +00:00
Aaron Huang
17c660dfeb Add keepalive related methods and fields to system APIs 
Add KeepalivePacketData to system API for mainline support.
Also, remove InvalidPacketException class from SocketKeepalive
and create a new InvalidPacketException class in android.net

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
      atest NetworkStackTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest android.net.cts
      atest android.net.wifi.cts
      atest android.telephony.cts

Change-Id: I2d982e8abb5cb6b4c74a20483550b18cf814320d
 2019-12-13 23:05:37 +08:00
Automerger Merge Worker
1bafcb692f Merge "Make getNetworkSpecifier() public API." am: ad60ef88e0 am: 31f969ba66 am: fead85c4d4 
Change-Id: I73894e4236dc5660f2eb54be3d48aa7359822947
 2019-12-12 12:47:00 +00:00
Automerger Merge Worker
fead85c4d4 Merge "Make getNetworkSpecifier() public API." am: ad60ef88e0 am: 31f969ba66 
Change-Id: I884c4e4c9ed891594845d599358f19f4a8e2ad60
 2019-12-12 12:26:06 +00:00
Chalard Jean
7412d7aa61 Make getNetworkSpecifier() public API. 
The builder lets clients set it, and this may be useful for
unit tests of apps. It should be public.
The need arises from uses of this in WiFi and Telephony
network factories.

Test: build
Bug: 135998869
Change-Id: I57279cac139c28e8654d2066ba0c60edd1e6cd98
 2019-12-12 13:10:55 +09:00
Roshan Pius
4f059fa56e Merge "InterfaceConfiguration: Don't use @hide Sets class" am: 2bf6bf92c6 am: e7182d5ba5 
am: 3f3dd3b432

Change-Id: I2538620dc77f8bbde5d3589aef22a1675e25fb03
 2019-12-10 06:09:15 -08:00
Roshan Pius
3f3dd3b432 Merge "InterfaceConfiguration: Don't use @hide Sets class" am: 2bf6bf92c6 
am: e7182d5ba5

Change-Id: I8d21b1465b3a1f5a8b54e2c4fbc8a8d6a7a6a475
 2019-12-10 06:04:32 -08:00
Roshan Pius
f4c912ec75 InterfaceConfiguration: Don't use @hide Sets class 
InterfaceConfiguration class is going to be jar-jar'ed by wifi (in
internal master). Remove this @hide usage to avoid transitive @hide
dependency on wifi mainline module.

Bug: 145904524
Test: Compiles
Change-Id: I4dbe69a8597d75d19fb12b4f4940b26b64fda35e
 2019-12-09 15:40:19 +00:00
Jeffrey Huang
77db950964 Merge "Rename writeToProto to be dumpDebug" 2019-12-06 18:53:15 +00:00
Aaron Huang
df293c54ad Merge "Add TrafficStats methods to public APIs" am: 8aed6e69f0 am: 1abb8de060 
am: d9b442b050

Change-Id: Iaf7fe6ba60048daecfde44c8348f68727b245d98
 2019-12-06 03:19:38 -08:00
Aaron Huang
d9b442b050 Merge "Add TrafficStats methods to public APIs" am: 8aed6e69f0 
am: 1abb8de060

Change-Id: Ib98dde2ae3b6cfee05e8d5536565ce72f6722e0b
 2019-12-06 03:12:46 -08:00
Aaron Huang
29667d2942 Add TrafficStats methods to public APIs 
Add methods to public APIs for mainline support.

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest android.net.cts
      atest android.net.wifi.cts

Change-Id: I21a9c0dbdc79b1f1041fc9e23c6a4e1e97ecde92
 2019-12-06 16:19:40 +08:00