Commit Graph

1979 Commits

Author SHA1 Message Date
TreeHugger Robot
21bc0cd211 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae am: b605d649f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I0fead8f6fbab6e9594fc7380c959872c0ebb65b7
2020-06-11 15:57:44 +00:00
TreeHugger Robot
1f6f0a7743 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 56a635ceb5 am: aa0f47ccb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I4ad9c2e14018c888e9a0b27f0b16643f233a7f6b
2020-06-11 15:57:28 +00:00
TreeHugger Robot
b605d649f4 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: Ia9a0de93d250d0e153d467224a705af3f58e5501
2020-06-11 15:42:40 +00:00
TreeHugger Robot
56a635ceb5 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I332e6f8965c1571508b310115c45cd4588c933ea
2020-06-11 15:15:15 +00:00
TreeHugger Robot
10ede1fcae Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I213f7fa7116f58ae63cb32ecbf9f62e8306a83d2
2020-06-11 15:14:42 +00:00
TreeHugger Robot
03cfdd49b6 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev 2020-06-11 15:00:57 +00:00
markchien
217d7b01f8 Pass entitlement configuration to Settings for entitlement check
Tethering resource configuration is move from framwork to tethering
module. Since tethering resource would not be accessible from outside
of tethering module, EntitlementManager would tell Settings the
entitlement configuration via intent extra when run entitlement check.

Bug: 146918263
Test: atest TetheringTests
Change-Id: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
2020-06-11 13:53:27 +08:00
Mark Chien
1b86312490 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 -s ours am: db97500dd3 -s ours
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history

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

Change-Id: Ieb4e3447ff41e51fa1435b35700b77630c99c498
2020-06-11 01:45:46 +00:00
Mark Chien
57b62408c7 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours am: ae4227ca95 -s ours am: 18cab6e6fb -s ours
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history

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

Change-Id: I6ee0e6c632ae6994f77cdca80c136ed90d18e43a
2020-06-11 01:45:39 +00:00
Mark Chien
db97500dd3 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 -s ours
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 0fffc85052 is in history

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

Change-Id: I9e40516a92566660e8c78a6759bfdc344ff19256
2020-06-11 01:45:30 +00:00
Mark Chien
18cab6e6fb [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours am: ae4227ca95 -s ours
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history

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

Change-Id: I02cf4f9233b7f43b92b5ca06e63f09f575b0956b
2020-06-11 01:44:49 +00:00
Mark Chien
3d1248a6ca [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 am: 637de75575 am: f9b5371ae1 -s ours
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history

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

Change-Id: I5c268f9d6f484e1e41f7cc86c2ddedf515c24b58
2020-06-11 01:44:46 +00:00
Mark Chien
637de75575 Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818359

Change-Id: I839176744df185f47b0020ce7c3f74084934bd55
2020-06-11 01:38:37 +00:00
Mark Chien
ae4227ca95 [automerger skipped] Merge "Move TetheringTests to presubmit" into rvc-dev am: ccf1551ed0 -s ours
am skip reason: Change-Id I80d29d06fde5a718c31a0a5ad2e2562be5bf419f with SHA-1 8e2f49b3da is in history

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

Change-Id: Ifbc27109febcaa49a6378ee3c3f8e54a444cc091
2020-06-11 01:37:43 +00:00
Mark Chien
ccf1551ed0 Merge "Move TetheringTests to presubmit" into rvc-dev 2020-06-11 01:35:38 +00:00
TreeHugger Robot
8feee2b04c [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours am: 1a3a459639 -s ours am: 089b4078b5 -s ours
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: Ieb94d16f8725bc70a8c00a6cf8c0e950be3821db
2020-06-10 18:39:25 +00:00
TreeHugger Robot
e1c7c5e786 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 -s ours am: c5e6b206a4 -s ours
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: Icbeb93e5c13642929ade573c7968c7c68c240fc5
2020-06-10 18:37:28 +00:00
TreeHugger Robot
05af655fc4 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 am: d21e2c925a -s ours
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

Change-Id: I74712ec7274fcd37f3e4006ca7dc398a73a27e18
2020-06-10 18:37:11 +00:00
TreeHugger Robot
089b4078b5 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours am: 1a3a459639 -s ours
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 5a07338239 is in history

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

Change-Id: Ia99757195a8359a700a5dd0bf692ff954d623c4c
2020-06-10 18:27:08 +00:00
TreeHugger Robot
c5e6b206a4 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 -s ours
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

Change-Id: I77d1d15d284190ee98321f7dfb8eaf8abd367fb9
2020-06-10 18:25:26 +00:00
TreeHugger Robot
8bc0ca8c74 Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11596544

Change-Id: I73dbaf73122522f7385520a8cee46c9299853b7c
2020-06-10 18:09:43 +00:00
TreeHugger Robot
1a3a459639 [automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 -s ours
am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

Change-Id: I8aa04d98967bc31dafdf7265e65b994274daf868
2020-06-10 18:09:36 +00:00
TreeHugger Robot
34d101b450 Merge "Make tether settings intent explicit" into rvc-dev 2020-06-10 17:47:19 +00:00
paulhu
5a07338239 Make tether settings intent explicit
Currently tethering notification is sending a pending intent for
redirecting user to tether settings page. However, this intent
is implicit that only create with
Settings.ACTION_TETHER_SETTINGS. For security reasons, this
intetnt should specify an explicit component to be delivered to.
Thus, specify the settings package name to this intent.

Test: atest TetheringTests
Bug: 156353008
Change-Id: I49187aee8a004caa890e2a73c0a28d280215c7d4
Merged-In: I49187aee8a004caa890e2a73c0a28d280215c7d4
2020-06-10 23:48:13 +08:00
TreeHugger Robot
8d071edd2e [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: c6298512e4 -s ours am: 8188870684 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 7c538fa7ff is in history

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

Change-Id: I55397954c2c6ce08a9e12fb97191a52d70dde662
2020-06-10 07:16:51 +00:00
Lorenzo Colitti
51428d92bb [automerger skipped] [BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62 am: 40e28391e5 -s ours am: e7b6ad5bfc -s ours
am skip reason: Change-Id Ic1f37de75b064d7c8717e1b496e13174bb8693ec with SHA-1 1aa15dab62 is in history

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

Change-Id: I67abeb69d2c2cada76925e2baa455d2a0664b443
2020-06-10 07:16:48 +00:00
Lorenzo Colitti
3b580215b4 [automerger skipped] [BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0 am: d0ca099573 -s ours am: 1d7c1bded8 -s ours
am skip reason: Change-Id Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627 with SHA-1 11b88351c0 is in history

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

Change-Id: I534b4dd25d3e7ad03bdb288974a797ffe368c79a
2020-06-10 07:16:45 +00:00
Hungming Chen
ada520f82c [automerger skipped] [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: 810a381cd4 am: 41c971a024 -s ours am: 2496028dee -s ours
am skip reason: Change-Id I85316ef09ff3c9389ded11dcc384493d699da48e with SHA-1 810a381cd4 is in history

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

Change-Id: Id263d81a1bd29657ae7a043873a667cde77d4f2d
2020-06-10 07:16:37 +00:00
Hungming Chen
c54a0c2a93 [automerger skipped] [BOT.3] Add unit test for polling network stats in the coordinator am: 6442858f9d am: a2f02c617e -s ours am: 8d4bbf4f2f -s ours
am skip reason: Change-Id Ib1756159a2047c5db7d31359b0f288f840bd1bb1 with SHA-1 6442858f9d is in history

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

Change-Id: I169707611da026910740c6385bcc938bfac5dbeb
2020-06-10 07:16:34 +00:00
Hungming Chen
82269fdb2c [automerger skipped] [BOT.2] Create a coordinator and stats provider to provide tether stats am: d50f53b58a am: 81d15877d4 -s ours am: 9269de4a72 -s ours
am skip reason: Change-Id I22e71f87b67668f7e733e4f215d93bf5b2c9380d with SHA-1 d50f53b58a is in history

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

Change-Id: I632ab139fd24dfaeafb1f8bc17ac6006fc491d0d
2020-06-10 07:16:23 +00:00
Hungming Chen
8637dd3b14 [automerger skipped] [BOT.1] Add a class ForwardedStats in TetheringUtils am: 020cb554f5 am: 3b29ab8c1b -s ours am: fa2109f84a -s ours
am skip reason: Change-Id Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493 with SHA-1 020cb554f5 is in history

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

Change-Id: I1868177c54775d174936ba1d9452b9b6e93139b5
2020-06-10 07:16:16 +00:00
TreeHugger Robot
a046f97ad2 [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours am: ea022aada2 -s ours am: 9cff08e68b -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history

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

Change-Id: Iaf86a3e7e662be202e0ccfa4dfeb6edf9f9ccf5e
2020-06-10 07:14:41 +00:00
TreeHugger Robot
8188870684 [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: c6298512e4 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 7c538fa7ff is in history

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

Change-Id: I3ed8753a3636e54d5e9c86b14a642f8bff62307d
2020-06-10 07:04:31 +00:00
Lorenzo Colitti
e7b6ad5bfc [automerger skipped] [BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62 am: 40e28391e5 -s ours
am skip reason: Change-Id Ic1f37de75b064d7c8717e1b496e13174bb8693ec with SHA-1 1aa15dab62 is in history

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

Change-Id: I9d2bfe44f055fd813a0a9284117ee14fbde72b9d
2020-06-10 07:04:28 +00:00
Lorenzo Colitti
1d7c1bded8 [automerger skipped] [BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0 am: d0ca099573 -s ours
am skip reason: Change-Id Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627 with SHA-1 11b88351c0 is in history

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

Change-Id: I807b6c43b359acc8079fe08de23dcdda2ad50c66
2020-06-10 07:04:24 +00:00
Hungming Chen
2496028dee [automerger skipped] [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: 810a381cd4 am: 41c971a024 -s ours
am skip reason: Change-Id I85316ef09ff3c9389ded11dcc384493d699da48e with SHA-1 810a381cd4 is in history

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

Change-Id: I4766b5518c21c2d1d69c365035530bdbe1d39b57
2020-06-10 07:04:20 +00:00
Hungming Chen
8d4bbf4f2f [automerger skipped] [BOT.3] Add unit test for polling network stats in the coordinator am: 6442858f9d am: a2f02c617e -s ours
am skip reason: Change-Id Ib1756159a2047c5db7d31359b0f288f840bd1bb1 with SHA-1 6442858f9d is in history

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

Change-Id: Idec97ca9bda2f0f1d35605a58cfd480ef289b087
2020-06-10 07:04:11 +00:00
Hungming Chen
9269de4a72 [automerger skipped] [BOT.2] Create a coordinator and stats provider to provide tether stats am: d50f53b58a am: 81d15877d4 -s ours
am skip reason: Change-Id I22e71f87b67668f7e733e4f215d93bf5b2c9380d with SHA-1 d50f53b58a is in history

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

Change-Id: Icaf300354c46be86ded8e61f5710d9cf8237820d
2020-06-10 07:04:06 +00:00
Hungming Chen
fa2109f84a [automerger skipped] [BOT.1] Add a class ForwardedStats in TetheringUtils am: 020cb554f5 am: 3b29ab8c1b -s ours
am skip reason: Change-Id Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493 with SHA-1 020cb554f5 is in history

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

Change-Id: I4b83375e92077a3657f2ead9953765c13ac39e51
2020-06-10 07:03:57 +00:00
TreeHugger Robot
9cff08e68b [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours am: ea022aada2 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history

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

Change-Id: I45b4d22af8275d69c045fe7a6705381e3394ca14
2020-06-10 07:03:06 +00:00
TreeHugger Robot
c6298512e4 Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818540

Change-Id: If839b5722aa8a648e5b97d4c0ef7a111a0754631
2020-06-10 06:55:05 +00:00
Lorenzo Colitti
40e28391e5 [BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818918

Change-Id: Ia561692d2405b59d7518bcd4bc18b4a3e5ee1943
2020-06-10 06:54:56 +00:00
Lorenzo Colitti
d0ca099573 [BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818381

Change-Id: I945ba8844fa6f666772cd8a968ba06f00ea8e360
2020-06-10 06:54:53 +00:00
Hungming Chen
41c971a024 [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: 810a381cd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818380

Change-Id: Ibd36f70caf5980c575958f141116bda380fda04a
2020-06-10 06:54:50 +00:00
Hungming Chen
a2f02c617e [BOT.3] Add unit test for polling network stats in the coordinator am: 6442858f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818379

Change-Id: I9817b26a7e53dcc018fe52c632276bea2f523b68
2020-06-10 06:54:48 +00:00
Hungming Chen
81d15877d4 [BOT.2] Create a coordinator and stats provider to provide tether stats am: d50f53b58a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818539

Change-Id: Ic87b80f2856282e30fbba93a85cdfd3e8edb9fad
2020-06-10 06:54:39 +00:00
Hungming Chen
3b29ab8c1b [BOT.1] Add a class ForwardedStats in TetheringUtils am: 020cb554f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818818

Change-Id: I9ec4b9f4018c2c96c1e4ff3c0da9a7509c39ee44
2020-06-10 06:54:36 +00:00
TreeHugger Robot
ea022aada2 [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history

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

Change-Id: I9ce4aead2bd29bcc8226f498bcc0940d04c55319
2020-06-10 06:51:00 +00:00
Lorenzo Colitti
ee55230440 [automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed am: 38fa7123d2 -s ours am: 0f28fa91bb -s ours
am skip reason: Change-Id I2d2cedf560319653f67f6b06f7abb0bf66eba91a with SHA-1 140042db6f is in history

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

Change-Id: I0524c3b513f1ba965ab299ad0bce28e9ca361070
2020-06-10 03:24:59 +00:00
Automerger Merge Worker
f6b2d0f3fb Merge "[automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed am: 38fa7123d2 am: d75045b4d1 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-10 03:24:42 +00:00