Commit Graph

13496 Commits

Author SHA1 Message Date
Bill Yi
e8045fcd3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58b943a701 -s ours am: 3a9562f000 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14707183

Change-Id: If036e8523c1117a2dae086e98e68d46f1f588728
2021-05-25 04:29:56 +00:00
Bill Yi
6f0e05783a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58b943a701 -s ours am: 6a9c51da3b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14707183

Change-Id: Ieafb73187e56d6901f03de4cc737cb23150c3b78
2021-05-25 04:28:45 +00:00
Bill Yi
6a9c51da3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58b943a701 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14707183

Change-Id: I536ce42a36898b24968c8be58968daaa997b6030
2021-05-25 04:08:17 +00:00
Bill Yi
3a9562f000 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58b943a701 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14707183

Change-Id: I5d2c0b09f9ee6b2e078c07eb160d17d24f26ce3a
2021-05-25 04:06:21 +00:00
Bill Yi
f39bff2b4e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01d8b26118 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14707184

Change-Id: Id4f18517d1a97ff65db8e9cee193109edddff603
2021-05-25 02:42:32 +00:00
Bill Yi
01d8b26118 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I43815f54aac23b9f43bfd427b7b18f22c97e0b31
2021-05-24 18:13:23 -07:00
Bill Yi
58b943a701 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I764f64b9ce1284955530e1c1b40c6441691845e2
2021-05-24 18:12:15 -07:00
Maciej Żenczykowski
a82bee5d64 Merge "Fix memory access violation in NetworkStack" am: fc592e8bc0 am: d417b64774 am: 705d0a9644
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715797

Change-Id: I3fa37993e3af019b82b96944342bd9fba6f3b0a5
2021-05-25 00:42:25 +00:00
Remi NGUYEN VAN
ebb497806b [automerger skipped] Merge "Merge history of packages/Connectivity" am: e107f26c5d am: d9338f3219 -s ours am: a986212f6a -s ours
am skip reason: Merged-In I7b5fd61cd551c7010f5b8ceabbfdd04f30f648dd with SHA-1 133d9178ec is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1714872

Change-Id: I4590709bd557c539a7f233e3c8c3a853c3f820e9
2021-05-25 00:42:05 +00:00
Maciej Żenczykowski
705d0a9644 Merge "Fix memory access violation in NetworkStack" am: fc592e8bc0 am: d417b64774
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715797

Change-Id: Idee66cfaec05391020420070ed8874b7b8c5f1bf
2021-05-25 00:18:35 +00:00
Remi NGUYEN VAN
a986212f6a [automerger skipped] Merge "Merge history of packages/Connectivity" am: e107f26c5d am: d9338f3219 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1714872

Change-Id: I9839115a1c8d9d1cee469ca21f174aa89dd5e75b
2021-05-25 00:18:04 +00:00
Maciej Żenczykowski
d417b64774 Merge "Fix memory access violation in NetworkStack" am: fc592e8bc0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715797

Change-Id: I659fb171fd5e3851cad8f9bcc6bacfea908a2125
2021-05-24 23:58:56 +00:00
Remi NGUYEN VAN
d9338f3219 Merge "Merge history of packages/Connectivity" am: e107f26c5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1714872

Change-Id: Ib84d148f27e154ce02c0df2d0ca33692455d6048
2021-05-24 23:57:28 +00:00
Maciej Żenczykowski
fc592e8bc0 Merge "Fix memory access violation in NetworkStack" 2021-05-24 23:56:06 +00:00
Remi NGUYEN VAN
e107f26c5d Merge "Merge history of packages/Connectivity" 2021-05-24 23:32:43 +00:00
Baligh Uddin
372cc1c2a0 [automerger skipped] Merge history of packages/Connectivity am: 2afd0986d3 am: 395514fa3d -s ours
am skip reason: skipped by user baligh

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14700782

Change-Id: Ibfcf5aee5b17caad5bf0b327e55af49b5410be83
2021-05-24 23:17:51 +00:00
Baligh Uddin
51ad4a48d1 [automerger skipped] Merge history of packages/Connectivity am: 2afd0986d3 am: 087dd90e5b -s ours
am skip reason: skipped by user reminv

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14701573

Change-Id: I6f4023633a4561f1bf68e34c2c751d2fe1d41733
2021-05-24 11:31:07 +00:00
Baligh Uddin
087dd90e5b Merge history of packages/Connectivity am: 2afd0986d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14700782

BUG: 186628461
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: Ia7945b929573c9a5e697fb69358cd6d3c8beab00
2021-05-24 08:21:53 +00:00
Baligh Uddin
395514fa3d Merge history of packages/Connectivity am: 2afd0986d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14700782

Change-Id: I7507f15a8a7b178035eda8af2345f19baa7267ec
2021-05-24 07:49:35 +00:00
Ye Jiao
86f56a135a Fix memory access violation in NetworkStack
Fix memory access violation in com_android_networkstack_tethering_BpfUtils.cpp
caused by invalid format string in com_android_networkstack_tethering_BpfUtils_isEthernet.
If rv is not valid, jniThrowException will format a string using
"Unknown hardware address type %s on interface %s". However, rv is an int but here
"%s" is used in fmt string, thus causing access violation of memory.

Use "%d" instead of "%s" for int.

Bug: 188757793
Change-Id: I9d8ec0708efd747e24b3b3ffed5336434d4f64a7
2021-05-24 06:12:56 +00:00
Baligh Uddin
3684713b8a Merge history of packages/Connectivity
Modified License Import for:
- Tethering/common/TetheringLib/Android.bp
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp

BUG: 186628461
TEST: TH
Merged-In: I7b5fd61cd551c7010f5b8ceabbfdd04f30f648dd
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ia2185820f485e8ad2d3626a96eab7f5a874736cf
2021-05-24 05:45:18 +00:00
Baligh Uddin
2afd0986d3 Merge history of packages/Connectivity
Modified Visibility / Includes for:
- Tethering/common/TetheringLib/Android.bp

Modified License Import for:
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp
Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml

BUG: 186628461
TEST: TH
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
2021-05-24 04:40:14 +00:00
Baligh Uddin
4b6d3cabbb Merge "Merge history of packages/Connectivity" into sc-v2-dev-plus-aosp 2021-05-24 03:40:59 +00:00
Mark Chien
276edc759b Merge "Disable tryCell when UpstreamMonitor stop" am: 011552cc54 am: bed1ae7b4c am: 1217274ac0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715791

Change-Id: Ia7ba42a7c5c5155c87f6872814391608227dc830
2021-05-24 03:18:48 +00:00
Mark Chien
1217274ac0 Merge "Disable tryCell when UpstreamMonitor stop" am: 011552cc54 am: bed1ae7b4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715791

Change-Id: I4f55ae5885e3904d0d2d17384875cb00809a0eed
2021-05-24 03:00:20 +00:00
Mark Chien
bed1ae7b4c Merge "Disable tryCell when UpstreamMonitor stop" am: 011552cc54
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715791

Change-Id: If734189ea422c37e524dc1fc6ad107307c7b0ad3
2021-05-24 02:44:59 +00:00
Mark Chien
011552cc54 Merge "Disable tryCell when UpstreamMonitor stop" 2021-05-24 02:27:13 +00:00
Baligh Uddin
133d9178ec Merge history of packages/Connectivity
Modified License Import for:
- Tethering/common/TetheringLib/Android.bp
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp
Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml

BUG: 186628461
TEST: TH
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: I7b5fd61cd551c7010f5b8ceabbfdd04f30f648dd
2021-05-23 18:54:37 +00:00
TreeHugger Robot
90a2635232 [automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a51d am: 69292a8890 -s ours
am skip reason: Merged-In I1de322c95aacc8924e95bcdbcfdbd1ec441de99c with SHA-1 f1ea9b302c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687246

Change-Id: Iadbeb14337aacf8edb419ffb03f66b636c489b04
2021-05-22 05:30:37 +00:00
TreeHugger Robot
c0c36c1f33 [automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a51d -s ours am: fead96f4e9 -s ours
am skip reason: Merged-In I1de322c95aacc8924e95bcdbcfdbd1ec441de99c with SHA-1 f3cf55f793 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687246

Change-Id: I1674bc25788b15f311a853e0c2ee65269fd89d74
2021-05-22 05:18:42 +00:00
TreeHugger Robot
fc6a513c02 [automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3aa -s ours am: e41bdecdb1 -s ours
am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 0b4be0203d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745

Change-Id: Iba94adfb3713288c908000248571f188750618ec
2021-05-22 05:17:51 +00:00
TreeHugger Robot
69292a8890 Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a51d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687246

Change-Id: If93dfeab89c644f67001c144253a594996c96eef
2021-05-22 05:12:50 +00:00
TreeHugger Robot
863a8080e1 [automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3aa am: 01dbd8fe81 -s ours
am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 8533f883c2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745

Change-Id: I8ba32a310ee65eacc7f325de15278b120f18c76a
2021-05-22 05:11:30 +00:00
TreeHugger Robot
8dc1970154 [automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe am: 3ef103ff9e -s ours
am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 fac2a72593 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293

Change-Id: Ib95f75820ff5950fd30e07ce11c4d3605dcffb27
2021-05-22 05:10:46 +00:00
TreeHugger Robot
079b613574 [automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f am: aa2d5601b4 -s ours
am skip reason: Merged-In I369e71dd6ae85da78e114ea8377967ab0bde787b with SHA-1 0aa413eba7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: I503dd64d09dc2b19682284d3d40e000d7189d955
2021-05-22 05:09:48 +00:00
TreeHugger Robot
fead96f4e9 [automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a51d -s ours
am skip reason: Merged-In I1de322c95aacc8924e95bcdbcfdbd1ec441de99c with SHA-1 f3cf55f793 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687246

Change-Id: I66773072e8ed02d6ce91c031bdfbdd8636dddce8
2021-05-22 05:08:21 +00:00
TreeHugger Robot
e41bdecdb1 [automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3aa -s ours
am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 8533f883c2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745

Change-Id: I12bf8a6e329e7d3555dd2387419e875f05017128
2021-05-22 05:07:45 +00:00
TreeHugger Robot
958fe9a51d Merge changes I1de322c9,Id0983d4b into sc-dev
* changes:
  Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
  Improve IKEv2/IPsec VPN by proposing more IKE algorithms
2021-05-22 05:05:51 +00:00
Baligh Uddin
d4e37ded44 Merge "Add OWNERS block for migration" am: 3dcbcae839 am: ff4dd6912d am: 4b0c629932
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476

Change-Id: I8bc8d16e7a6cf0b5a032fc2ea42d6f93cd3d77f2
2021-05-22 05:03:42 +00:00
TreeHugger Robot
46fa3c96f7 [automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe -s ours am: ff7a480258 -s ours
am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 bc66712394 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293

Change-Id: I4c1088a626cb0c8d0dd17ddbac6ff47ffee20b1c
2021-05-22 05:03:32 +00:00
TreeHugger Robot
01dbd8fe81 Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745

Change-Id: I7ecafab76cf840be01207b6e504e9ce0a8b579a9
2021-05-22 05:03:31 +00:00
TreeHugger Robot
a3c9576a41 [automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f -s ours am: aa08179040 -s ours
am skip reason: Merged-In I369e71dd6ae85da78e114ea8377967ab0bde787b with SHA-1 92346fdf33 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: If57b7100cea33ca4eadf67ab61be146125bd77a0
2021-05-22 05:03:23 +00:00
TreeHugger Robot
3ef103ff9e Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293

Change-Id: I77eba9e12795cc32f04073c3d18dc67dc1e3074b
2021-05-22 05:03:11 +00:00
TreeHugger Robot
aa2d5601b4 Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: I71ea7c265e109f44286dd2aafeee2964f24f2ed2
2021-05-22 05:02:45 +00:00
Baligh Uddin
4b0c629932 Merge "Add OWNERS block for migration" am: 3dcbcae839 am: ff4dd6912d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476

Change-Id: Icdab309144d7f4fa5ec1eb80efd919c66d408839
2021-05-22 05:01:43 +00:00
TreeHugger Robot
424e2ef3aa Merge "Check location permission for ConnDiags last." into sc-dev 2021-05-22 05:01:18 +00:00
TreeHugger Robot
ff7a480258 [automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe -s ours
am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 bc66712394 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293

Change-Id: I3672d2fe9420368e76ce7e724b7d9c2b7ac26660
2021-05-22 05:00:52 +00:00
TreeHugger Robot
aa08179040 [automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f -s ours
am skip reason: Merged-In I369e71dd6ae85da78e114ea8377967ab0bde787b with SHA-1 92346fdf33 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: Ib7f2157f4b1cf82dd7d124ac263fd9c3a61f2c7c
2021-05-22 05:00:41 +00:00
TreeHugger Robot
08bbc34bbe Merge "Use CS identity to update setting while performing factory reset" into sc-dev 2021-05-22 04:59:28 +00:00
Baligh Uddin
ff4dd6912d Merge "Add OWNERS block for migration" am: 3dcbcae839
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476

Change-Id: I06e249398983790eeda9378b36f181ee459c10e1
2021-05-22 04:37:11 +00:00