Commit Graph

1906 Commits

Author SHA1 Message Date
Jeffrey Huang
47427d1d45 Merge "Rename writeToProto to be dumpDebug" 2019-12-06 18:53:15 +00:00
Aaron Huang
2fc1d26363 Merge "Add TrafficStats methods to public APIs" am: 8aed6e69f0 am: 1abb8de060
am: e58fff9f29

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

Change-Id: Ib98dde2ae3b6cfee05e8d5536565ce72f6722e0b
2019-12-06 03:12:46 -08:00
Aaron Huang
443651d3e2 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
Jeffrey Huang
f9f6d87ced Rename writeToProto to be dumpDebug
We want to eventually migrate some of these APIs to be @SystemApi for mainline modules.
The #dumpDebug name is more appropriate than #writeToProto.

Bug: 142279786
Test: Manual
Change-Id: I60793e91cedf6b720d4ecef6a8484f4fed4ff30f
2019-12-05 11:28:11 -08:00
Automerger Merge Worker
89843fe9cb [automerger skipped] Merge "Replace the permission of internal connectivity checks" am: 6be69420df am: b869b18abe -s ours
am skip reason: Change-Id I8f2dd1cd0609056494eaf612d39820e273ae093f with SHA-1 a262cc1154 is in history

Change-Id: Ib7fe99ba9f914d33da3145b926568bcbe418e6b2
2019-12-04 20:01:55 +00:00
Automerger Merge Worker
b1188209dd Merge "Merge Android10 QPR1 into AOSP master" am: 2b65793cd6 am: d88ddd4545
Change-Id: Ia31d8ba0396b6a5bf63863b4318b7543283851b2
2019-12-04 16:58:08 +00:00
Paul Hu
b869b18abe Merge "Replace the permission of internal connectivity checks" am: 6be69420df
am: 3256e731e3

Change-Id: I461936789b24940cc81146e9d0fc6c4c455206ed
2019-12-04 08:51:28 -08:00
Xin Li
d88ddd4545 Merge "Merge Android10 QPR1 into AOSP master" am: 2b65793cd6
am: d2e25aa6dd

Change-Id: I3bf58b1afbff9e0a40106771a9f389b1e2c1b940
2019-12-04 08:09:19 -08:00
paulhu
a262cc1154 Replace the permission of internal connectivity checks
A number of connectivity checks that protect system-only methods
check for CONNECTIVITY_INTERNAL, but CONNECTIVITY_INTERNAL is a
signature|privileged permission. We should audit the permission
checks, and convert checks that protect code that should not be
called outside the system to a signature permission. So replace
all CONNECTIVITY_INTERNAL to other proper permissions.

Bug: 32963470
Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Change-Id: I8f2dd1cd0609056494eaf612d39820e273ae093f
2019-12-04 11:45:51 +08:00
paulhu
6569cef6a6 Replace the permission of internal connectivity checks
A number of connectivity checks that protect system-only methods
check for CONNECTIVITY_INTERNAL, but CONNECTIVITY_INTERNAL is a
signature|privileged permission. We should audit the permission
checks, and convert checks that protect code that should not be
called outside the system to a signature permission. So replace
all CONNECTIVITY_INTERNAL to other proper permissions.

Bug: 32963470
Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Change-Id: I8f2dd1cd0609056494eaf612d39820e273ae093f
Merged-In: I8f2dd1cd0609056494eaf612d39820e273ae093f
2019-12-04 11:44:45 +08:00
Xin Li
b70005bd44 Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I557701733b49b0f231c89165239ba07c0fa288d2
2019-12-02 21:25:07 -08:00
Mark Chien
9e2676c58d [automerger skipped] Merge changes from topic "tether_migrate" am: 3c38c89a12 am: 7ee15b3bd9
am: 34fb10e5ee -s ours
am skip reason: change_id I4ed08d20f8b7476b8ecd5d018b75806dd2f22cc1 with SHA1 1ddfba4a60 is in history

Change-Id: I630b00c69238730fe5aa267a658f93edb236acc6
2019-11-30 04:36:38 -08:00
markchien
4663d8e042 [automerger skipped] [Tether07] Migrate Tethering into module am: 4686dd8958 am: 6737c8ba3b
am: a21bc5f2a8 -s ours
am skip reason: change_id I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3 with SHA1 87f0b94f3b is in history

Change-Id: Ie6a28a142e2cf75adfc3d1a45d87e9daa67423e4
2019-11-30 04:36:30 -08:00
Mark Chien
34fb10e5ee Merge changes from topic "tether_migrate" am: 3c38c89a12
am: 7ee15b3bd9

Change-Id: Ice864e02b2ef9da73f5a69e0668b6856e718988f
2019-11-30 04:31:35 -08:00
markchien
a21bc5f2a8 [Tether07] Migrate Tethering into module am: 4686dd8958
am: 6737c8ba3b

Change-Id: I6e71b418b7303d37144532ab056c21ccbefcb554
2019-11-30 04:31:28 -08:00
Mark Chien
7ee15b3bd9 Merge changes from topic "tether_migrate"
am: 3c38c89a12

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac
2019-11-30 04:26:07 -08:00
markchien
6737c8ba3b [Tether07] Migrate Tethering into module
am: 4686dd8958

Change-Id: I1aaa034e91eae2d6e9abcbbd70741a54a18b3ddc
2019-11-30 04:25:57 -08:00
Mark Chien
3c38c89a12 Merge changes from topic "tether_migrate"
* changes:
  [Tether10]Remove UserManagerInternal usage in Tethering
  [Tether07] Migrate Tethering into module
  [Tether07] Clean up build rule for libtetheroffloadjni
2019-11-30 12:17:47 +00:00
markchien
4686dd8958 [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
Merged-In: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-30 10:03:08 +00:00
markchien
87f0b94f3b [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-29 07:05:21 +00:00
Jayachandran Chinnakkannu
b8079c2db7 Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de87 am: 19a25b3ee5
am: 0f6bb0af4e

Change-Id: I8a7f28feb66265be2379beda7bc3fce732e4a294
2019-11-26 09:37:25 -08:00
Jayachandran Chinnakkannu
0f6bb0af4e Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de87
am: 19a25b3ee5

Change-Id: I916e810b6350be9c1a6b24f2a652e05a1fa444fa
2019-11-26 09:31:33 -08:00
Jayachandran Chinnakkannu
19a25b3ee5 Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)"
am: 9dcbd6de87

Change-Id: Iada558f0d94e08281b6e41825946e5b807618da6
2019-11-26 09:26:07 -08:00
Jayachandran C
27d08940e0 Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)
This CL deletes the reference to this API as its used in a dead code
which is used for debugging only.

Bug: 140908357
Test: Build
Change-Id: I9fa1996ab5fdb5ab884128d06c2e92bab164dea7
2019-11-25 15:19:47 -08:00
Jayachandran Chinnakkannu
27ee5f7d0c Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d am: 59a00010fb
am: c71f5fc937

Change-Id: Ief1f090f3664d583565f291c89357bfbac58fe17
2019-11-18 01:09:40 -08:00
Jayachandran Chinnakkannu
c71f5fc937 Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d
am: 59a00010fb

Change-Id: I7613a654dd726bcf5428a5a07ad4369f616bbcfa
2019-11-18 01:05:02 -08:00
Jayachandran Chinnakkannu
59a00010fb Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"
am: 73e22ad21d

Change-Id: I555617ff893acf4c53e6a73d6591b6aaebf3ce50
2019-11-17 22:30:01 -08:00
Jayachandran C
270197bc8d Remove usage of Telephonymanager getDefault() and from() hidden APIs
This CL replaces with getSystemService(TelephonyManager.class)

Bug: 140768340
Test: atest frameworks/base/tests/net
Change-Id: I0f14cc5440fa85c81ab90f3199e9e91c1b00f5e1
2019-11-15 19:26:33 -08:00
Artur Satayev
8b319523fe [automerger skipped] Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa am: 5f7358da57
am: 5103212960 -s ours
am skip reason: change_id Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6 with SHA1 817cc44c62 is in history

Change-Id: I1e9b0579e65071e042c4595083427bcc7889c15e
2019-11-13 14:05:06 -08:00
Artur Satayev
5103212960 Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa
am: 5f7358da57

Change-Id: Ic691d764839ecf34daa8b53aa92497e013c9a2a7
2019-11-13 10:40:54 -08:00
Artur Satayev
5f7358da57 Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."
am: a98026f7aa

Change-Id: Ia39fbc2200aa7262e4a05b0710b7a382bb01b276
2019-11-13 10:33:06 -08:00
Artur Satayev
122a87695f Add @UnsupportedAppUsage to test apis that are known to be used by apps.
go/testapi-enforcement

Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 15:05:56 +00:00
Artur Satayev
817cc44c62 Add @UnsupportedAppUsage to test apis that are known to be used by apps.
go/testapi-enforcement

Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 12:58:29 +00:00
Joshua Baxter
c528439458 docs: fix a couple of minor typos am: 6eae9bbc0f am: 46cc54fd21 am: ffcb948028
am: a3ef3d991c

Change-Id: I7737e9479ef6adc1ebe4c0e828eb4516daf20c0d
2019-11-06 14:17:40 -08:00
Joshua Baxter
a3ef3d991c docs: fix a couple of minor typos am: 6eae9bbc0f am: 46cc54fd21
am: ffcb948028

Change-Id: Id084d29a91ae1a68176439c403e7475b2d497f9d
2019-11-06 14:05:28 -08:00
Joshua Baxter
46cc54fd21 docs: fix a couple of minor typos
am: 6eae9bbc0f

Change-Id: Id2139f5f685d2c4677d5e06ff7fda4b74e61a30c
2019-11-06 13:33:53 -08:00
Joshua Baxter
6eae9bbc0f docs: fix a couple of minor typos
test: make ds-docs
Change-Id: Ia68f66980e447209efb8102a156f78314c199f56
bug: 36979979
Exempt-From-Owner-Approval: docs-only change
2019-11-06 21:13:25 +00:00
Xin Li
d639a99b8c [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: e569a024aa -s ours am: 8f2cea24e0 -s ours
am: c22db3e73a -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I712ca737683eb8ecf584fdfbdf0378afce7fa0ca
2019-09-11 15:42:29 -07:00
Xin Li
8f2cea24e0 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: e569a024aa -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I6c6c0cd8aa4ac5968252f29c1e45f0e0768f5204
2019-09-11 13:59:58 -07:00
Xin Li
e569a024aa Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Xin Li
da8bfb7dc1 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ec3f3fbce6 -s ours am: 03f35832bf -s ours am: 2d4b126a81 am: 68d50f9b95
am: 04504fa3bb -s ours
am skip reason: subject contains skip directive

Change-Id: Ied21f8bfc652bbb33b4bb703927a2b77ef4b54b3
2019-09-05 15:33:25 -07:00
Xin Li
68d50f9b95 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ec3f3fbce6 -s ours am: 03f35832bf -s ours
am: 2d4b126a81

Change-Id: Ibf2eaa45d685bba0b3472b510a13e2c78a5f2277
2019-09-05 14:44:40 -07:00
Xin Li
2d4b126a81 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ec3f3fbce6 -s ours
am: 03f35832bf -s ours
am skip reason: subject contains skip directive

Change-Id: I112f6ad00252d63046d6732a5c0fa72e7ff64e9c
2019-09-05 14:06:52 -07:00
Xin Li
ec3f3fbce6 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I9e3c4fe5406c9913d50fe3b07d7f7cef7a246b96
2019-09-04 13:33:59 -07:00
Aurimas Liutikas
a124df140e [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours am: b3c5131dcb -s ours am: 48d66161b9 -s ours am: f4f18c5a47 -s ours
am: 5403265dc0 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I917109b14ba43c16af4c5977d8653e38a4900472
2019-08-30 13:03:09 -07:00
Aurimas Liutikas
f4f18c5a47 [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours am: b3c5131dcb -s ours
am: 48d66161b9 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: If5de5ce42bdec77db69dc229a2f5c7367b28a560
2019-08-30 12:33:40 -07:00
Aurimas Liutikas
48d66161b9 [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours
am: b3c5131dcb -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I729acc32ce9625df646bf0a820f9f4d95a9d60cf
2019-08-30 12:08:42 -07:00
Aurimas Liutikas
b3c5131dcb [automerger skipped] Merge "Add missing nullability annotations."
am: 9b361c2674 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I7b2712e4ab3635f94f8257d88f24c20bc68a3ac0
2019-08-30 11:49:09 -07:00
Aurimas Liutikas
d81733edf9 [automerger skipped] Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be am: 88be2b2667 am: aa02c3d5b8
am: 488d37b2d0 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 8ff316034a is in history

Change-Id: Ifdf538d94799e4978a0b62fac63bd128fc2e1b5b
2019-08-30 09:04:37 -07:00