Commit Graph

446256 Commits

Author SHA1 Message Date
Treehugger Robot
d8f24b052d Merge "Add MODIFY_DEFAULT_AUDIO_EFFECTS permission to shell" am: a3161c6627 am: 3637bc567d
Change-Id: I2fbc86155d031625dfd68605bb632cfca63c714d
2020-03-19 17:51:15 +00:00
Treehugger Robot
3637bc567d Merge "Add MODIFY_DEFAULT_AUDIO_EFFECTS permission to shell" am: a3161c6627
Change-Id: I2d4d701409277b6ef98e84795a9851ea84a9a3f6
2020-03-19 17:32:48 +00:00
Treehugger Robot
a3161c6627 Merge "Add MODIFY_DEFAULT_AUDIO_EFFECTS permission to shell" 2020-03-19 17:11:10 +00:00
Mark Chien
ebac445efa Merge "TetheringManager API clean up" am: c686fa828b am: 06ef41cf87
Change-Id: I07131e5179d6232a71cf734b428ba627597e6cb9
2020-03-19 16:29:42 +00:00
Treehugger Robot
fd8a054659 Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" am: e215c5d047 am: d0b9291587
Change-Id: I5bb2668555313716cb04ccf2ddb13fce7b56b5ad
2020-03-19 16:29:14 +00:00
Mark Chien
06ef41cf87 Merge "TetheringManager API clean up" am: c686fa828b
Change-Id: I93e9bb5f596fff27de236b56cf21f9edb3c0204a
2020-03-19 16:17:27 +00:00
Treehugger Robot
d0b9291587 Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" am: e215c5d047
Change-Id: If0000228b44b9f379c6e1499d7d86d7738889ee2
2020-03-19 16:16:58 +00:00
Mark Chien
c686fa828b Merge "TetheringManager API clean up" 2020-03-19 16:09:21 +00:00
Treehugger Robot
e215c5d047 Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" 2020-03-19 15:51:32 +00:00
Treehugger Robot
1e4ae99495 Merge "Release the interface request when Ethernet tethering is stopped." am: 8281abfdb6 am: 651ebee230
Change-Id: I8bd79fb544d6ecc3a298475eb5a9c30466d294d1
2020-03-19 15:23:23 +00:00
Treehugger Robot
651ebee230 Merge "Release the interface request when Ethernet tethering is stopped." am: 8281abfdb6
Change-Id: Ia0491c302528ce0a727c1ffa77a1fc3a7508f601
2020-03-19 15:08:46 +00:00
Treehugger Robot
8281abfdb6 Merge "Release the interface request when Ethernet tethering is stopped." 2020-03-19 14:59:12 +00:00
Lorenzo Colitti
925c8bab17 Release the interface request when Ethernet tethering is stopped.
When the Ethernet interface becomes unavailable (e.g., because
the cable was unplugged or the interface was removed), or when
setEthernetTethering(false) is called, release the Ethernet
interface request.

This ensures that:
- The Ethernet interface immediately becomes available for use in
  client mode.
- If an interface later becomes available, tethering is not
  automatically started. This is consistent with what happens for
  other downstream types such as wifi and USB. Evey time one of
  those downstreams goes down, tethering is stopped and will not
  be restarted.

Test: manual
Bug: 148824036
Change-Id: Iaf85e800569f2e08c39f7ebb96f8aa34f6e53133
2020-03-19 22:35:28 +09:00
Anton Hansson
ce86e3864e Merge "Don't pass annotation srcs to metalava for modules" am: 784474bbb6 am: 5ebda667c3
Change-Id: Ic3d497fcbe2e75b4621f1ccdb6d927a0ee66e976
2020-03-19 12:17:37 +00:00
Anton Hansson
5ebda667c3 Merge "Don't pass annotation srcs to metalava for modules" am: 784474bbb6
Change-Id: Icbb4daaceeee24857ab2f406449686e249b64992
2020-03-19 12:07:15 +00:00
Lorenzo Colitti
9b49d1ea27 Merge "Make Ethernet interfaces more testable." am: e30d9267ef am: f8079aaca9
Change-Id: I4b262fb9cf66a7e1f859e03c7df0fd337658c376
2020-03-19 11:47:03 +00:00
Anton Hansson
784474bbb6 Merge "Don't pass annotation srcs to metalava for modules" 2020-03-19 11:46:45 +00:00
markchien
32726e00e2 Move NetworkCallback to last parameter for new exposed requestNetwork
Bug: 151243698
Test: atest TetheringTests
Change-Id: I87ef1d451eefa6998b9793c4eacabae978376d24
Merged-In: I87ef1d451eefa6998b9793c4eacabae978376d24
2020-03-19 11:36:07 +00:00
markchien
743236096e TetheringManager API clean up
Per API review:
- @IntDef defined on the type integer parameter
- have getters on each parameter that is set in the
  TetheringRequest.Builder
- new added API should not be deprecated
Below APIs is moved from system-current to module-lib-current that only
plafrom code(e.g. ConnectivityManager and Settings) can use them.
TetheringRequest.
onTetherableInterfaceRegexpsChanged, TetheringInterfaceRegexps:
Only platform code can use them because interfaces by regular
expressions are a mechanism which is planning to be deprecated.

Also rename some constants for easier to understand.

Bug: 149858697
Bug: 151243337
Test: m doc-comment-check-docs
      atest TetheringTests
Change-Id: I45cb21d5bc919f6d32c42650326597d5173ea028
Merged-In: Idd041f0fbeca411ea23e49786a50dd7feb77ef45
2020-03-19 19:32:50 +08:00
Lorenzo Colitti
f8079aaca9 Merge "Make Ethernet interfaces more testable." am: e30d9267ef
Change-Id: I456acb05d548b3d0281e500cfd91d888441d7f94
2020-03-19 11:30:33 +00:00
Lorenzo Colitti
e30d9267ef Merge "Make Ethernet interfaces more testable." 2020-03-19 11:12:09 +00:00
Paul Hu
0de62b1d3b Merge "[TNU1.2] Add string for client number notification" am: 2435a6539d am: d596890446
Change-Id: Ie92f063ad6a7d39bd131e0692a02a6702d6bf774
2020-03-19 10:59:07 +00:00
Paul Hu
584c53ded9 Merge "Add ConnectivityService owner" am: f5302ac9b5 am: 8da40c00c7
Change-Id: I5d02099e08bbbe7ccc9b13754a0597ae55ab9c3c
2020-03-19 10:58:50 +00:00
Paul Hu
d596890446 Merge "[TNU1.2] Add string for client number notification" am: 2435a6539d
Change-Id: Ibbead3667ec87cae0f2cd8735dabf77d3d6dd07a
2020-03-19 10:45:24 +00:00
Paul Hu
8da40c00c7 Merge "Add ConnectivityService owner" am: f5302ac9b5
Change-Id: I72aaa32a3d7fc8df9181a2af981522e826a7335e
2020-03-19 10:45:10 +00:00
Paul Hu
2435a6539d Merge "[TNU1.2] Add string for client number notification" 2020-03-19 10:20:27 +00:00
Paul Hu
f5302ac9b5 Merge "Add ConnectivityService owner" 2020-03-19 10:19:51 +00:00
Neil Fuller
c37598cfc3 Merge "Raise tz standards for uninitialized devices" am: 325098922c am: d40526cc4c
Change-Id: I42df6aca42aeb788f5a7533d585f52c9326c3ed3
2020-03-19 10:04:26 +00:00
Neil Fuller
d40526cc4c Merge "Raise tz standards for uninitialized devices" am: 325098922c
Change-Id: I654f18746745341089731bb58969c010caefeae8
2020-03-19 09:46:26 +00:00
Junyu Lai
bfb6add167 Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f am: b3c511d028 am: a176e5163f
Change-Id: If5e59645f5f5754b40da5a3cb945d34a14605062
2020-03-19 09:40:56 +00:00
junyulai
afeb6bca53 [SM07] Make combine subtype configurable from Settings am: b56b6138bf am: 98aeabbf78
Change-Id: I65470e2ce4aae26308a395ce1e5465ac27914f60
2020-03-19 09:40:53 +00:00
junyulai
a7971c4473 [SM05] Enable record mobile network stats by collapsed rat type am: 3f4d4c1500 am: 898e74cee5
Change-Id: Ie23c2131349412d9dae04db122d7b3d14047b87f
2020-03-19 09:40:51 +00:00
junyulai
3e7340155f [SM04] Support fetching data with NetworkTemplate with subType am: 3682e8f0df am: 24c6d5ba7a
Change-Id: Ib47b320e467daed3c8fb746ed99dd34657d1799b
2020-03-19 09:40:48 +00:00
junyulai
8586fa48e9 [SM02] Support record mobile network stats by collapsed rat type am: 214e8fa386 am: 7d03200910
Change-Id: I3a8965424f1f28d1fa63bb469c10c735af67eb31
2020-03-19 09:40:45 +00:00
Mohammad Islam
8eb3dda77b Merge changes from topic "key-rota-cp" am: a705b8063f am: 6551543b1e
Change-Id: Ief2dcbab2164e750e7e522c6d1e544c94022c5cf
2020-03-19 09:39:07 +00:00
Mohammad Samiul Islam
b640d2ac64 Refactor commitApkSession into two separate methods am: b929a54783 am: bfb33f24fe
Change-Id: Ib7483fabf422861a5e3b72b07d9ead99c6c66f50
2020-03-19 09:39:04 +00:00
Neil Fuller
325098922c Merge "Raise tz standards for uninitialized devices" 2020-03-19 09:33:35 +00:00
Junyu Lai
a176e5163f Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f am: b3c511d028
Change-Id: I091c93ba6b0001253e2b0679eee48293b4e51afc
2020-03-19 09:31:08 +00:00
junyulai
98aeabbf78 [SM07] Make combine subtype configurable from Settings am: b56b6138bf
Change-Id: I0c3f4a02f16eb6a4d9e48fa775bf456707d2b1bb
2020-03-19 09:31:02 +00:00
junyulai
898e74cee5 [SM05] Enable record mobile network stats by collapsed rat type am: 3f4d4c1500
Change-Id: If4bcfaefd2244be67449066ef54a6bdc0c00eb86
2020-03-19 09:31:00 +00:00
junyulai
24c6d5ba7a [SM04] Support fetching data with NetworkTemplate with subType am: 3682e8f0df
Change-Id: I3927277c41ba4b0cb5dc3a0309a5d4ca8f4d1dbc
2020-03-19 09:30:56 +00:00
junyulai
7d03200910 [SM02] Support record mobile network stats by collapsed rat type am: 214e8fa386
Change-Id: Ia7dd0ae44fe951c00e365b94ac3b8a93230c96ab
2020-03-19 09:30:51 +00:00
Mohammad Islam
6551543b1e Merge changes from topic "key-rota-cp" am: a705b8063f
Change-Id: I4c6c6855303ca0fc11838de228f861d1e360e9ce
2020-03-19 09:27:18 +00:00
Mohammad Samiul Islam
bfb33f24fe Refactor commitApkSession into two separate methods am: b929a54783
Change-Id: I30c5dc2eb93b6f800204b7cf0ee9cbb2a948115b
2020-03-19 09:27:12 +00:00
Junyu Lai
b3c511d028 Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f
* changes:
  [SM08] Add NetworkTemplate unit test for fetching mobile data usage
  [SM07] Make combine subtype configurable from Settings
  [SM05] Enable record mobile network stats by collapsed rat type
  [SM04] Support fetching data with NetworkTemplate with subType
  [SM02] Support record mobile network stats by collapsed rat type
2020-03-19 09:10:57 +00:00
Mohammad Islam
a705b8063f Merge changes from topic "key-rota-cp"
* changes:
  Allow apex packages to be signed with key that has rollback capability
  Refactor commitApkSession into two separate methods
2020-03-19 09:08:53 +00:00
paulhu
b9a4a1664d Add ConnectivityService owner
Bug: N/A
Test: N/A
Change-Id: I5c9c1d260c4cbc33af61106977b53fa1638074da
2020-03-19 16:31:46 +08:00
Anton Hansson
397eb47191 Don't pass annotation srcs to metalava for modules
Doing so can make these annotation end up in API tracking files
for modules, which we don't want. Put them on the classpath instead.

Bug: 147768409
Test: m
Change-Id: Ibb044c099174ee8591e14b6e2c683a46c1a756ef
Merged-In: Ibb044c099174ee8591e14b6e2c683a46c1a756ef
2020-03-19 08:24:15 +00:00
paulhu
3fa8b68b62 [TNU1.2] Add string for client number notification
Add string for client number notification

Bug: 122085773
Test: atest TetheringTests
Change-Id: Icc4e59ce3b2d8d4c1c7883c2f9d040d3ce563f09
2020-03-19 15:48:23 +08:00
Rick Yiu
d72b4a7138 Merge "Revert "resolve merge conflicts of e6dddc99898fe5da4d24e6c3caf6e..."" into qt-qpr1-dev-plus-aosp 2020-03-19 07:02:35 +00:00