Commit Graph

1170 Commits

Author SHA1 Message Date
Mark Chien
36dd27fedd [automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f -s ours am: e37bb0c05a -s ours
am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 147e5765ee is in history

Change-Id: I5ba676c0b42927d4e136f9e335b4b609e6c7786a
2020-05-08 13:23:33 +00:00
Mark Chien
e37bb0c05a [automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f -s ours
am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 147e5765ee is in history

Change-Id: I017e1107ddec8b7700eb0bf64c21436bd7813fc1
2020-05-08 13:16:43 +00:00
Mark Chien
27b296db53 Merge "Allow to exempt from entitlement check" am: 469314ecc8 am: ec7cf5e356 am: fa0384ea72
Change-Id: Iad0dfaef007cc48b97124c5c4a530fbbe8510802
2020-05-08 12:53:17 +00:00
Treehugger Robot
896b666cf4 [automerger skipped] Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0 am: b8345314d8 -s ours am: f21b93a7f2 -s ours
am skip reason: Change-Id I4147173b5f3668491ff9cb7f1f86715b036d6d4b with SHA-1 9548c8580c is in history

Change-Id: I96daf51b120704190366ec1a99c3e5d2390d49b4
2020-05-08 12:53:08 +00:00
Mark Chien
fa0384ea72 Merge "Allow to exempt from entitlement check" am: 469314ecc8 am: ec7cf5e356
Change-Id: I34a405492bd2e80aa731e5ac5d56034f7a80cd45
2020-05-08 12:47:48 +00:00
Treehugger Robot
f21b93a7f2 [automerger skipped] Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0 am: b8345314d8 -s ours
am skip reason: Change-Id I4147173b5f3668491ff9cb7f1f86715b036d6d4b with SHA-1 9548c8580c is in history

Change-Id: I115a3426c92c4c7bfe78e3318b6ecf6cfcbe2d5d
2020-05-08 12:47:29 +00:00
Mark Chien
ec7cf5e356 Merge "Allow to exempt from entitlement check" am: 469314ecc8
Change-Id: I1252b9670efa16118d428cda2ab94e2dca757090
2020-05-08 12:29:58 +00:00
Treehugger Robot
b8345314d8 Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0
Change-Id: Iff6db0c1f58356a0e573654175c3780b8fa09a66
2020-05-08 12:29:38 +00:00
Mark Chien
469314ecc8 Merge "Allow to exempt from entitlement check" 2020-05-08 12:28:06 +00:00
Treehugger Robot
bfd392c4c0 Merge "Override tethering module APK-in-APEX for Go variant" 2020-05-08 12:11:47 +00:00
Mark Chien
0dafa92b93 Address the comment of aosp/1288493
Bug: 141256482
Test: atest TetheringTests
Merged-In: I0cf337625cee31a47879c59e9b18657ea7624eb4
Change-Id: I0cf337625cee31a47879c59e9b18657ea7624eb4
2020-05-08 11:57:57 +00:00
Mark Chien
4fa682fe4e Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86 am: 250a10eec4
Change-Id: Iea3ae73bdafc8ca3be77be23e70ba86ab623a128
2020-05-08 11:17:58 +00:00
Mark Chien
250a10eec4 Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86
Change-Id: Idfe4cbf12cbcc233c1061b26e962dcf21cd36de0
2020-05-08 11:00:42 +00:00
markchien
f5078f489d Allow to exempt from entitlement check
To exempt from entitlement check, caller need to hold TETHER_PRIVILEGED
permission.

Bug: 141256482
Test: atest TetheringTests

Change-Id: I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0
2020-05-08 18:55:26 +08:00
Mark Chien
b51ef98b86 Merge "Address the comment of aosp/1288493" am: 974d6f5978
Change-Id: I706462c5dc4a0dbd4b921f2c446a13b1b408948a
2020-05-08 10:45:12 +00:00
Mark Chien
974d6f5978 Merge "Address the comment of aosp/1288493" 2020-05-08 10:30:49 +00:00
Jooyung Han
5f2f34a042 Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299 am: e25536866e am: 669772eb76
Change-Id: I57ab89f20d066fe68110e1391032ae56c40b4ac0
2020-05-08 09:56:45 +00:00
Jooyung Han
669772eb76 Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299 am: e25536866e
Change-Id: I3152d9e94e0a1fce02ecb16b3ec0cea92c856ebe
2020-05-08 09:40:48 +00:00
Jooyung Han
e25536866e Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299
Change-Id: I30b90b19967d2a4cd8e283420f856816c3e4bbb4
2020-05-08 09:04:30 +00:00
Jooyung Han
50f4887299 Merge "Set min_sdk_version for updatable mainline modules" 2020-05-08 08:45:49 +00:00
markchien
147e5765ee Address the comment of aosp/1288493
Bug: 141256482
Test: atest TetheringTests
Change-Id: I0cf337625cee31a47879c59e9b18657ea7624eb4
2020-05-08 15:51:52 +08:00
Mark Chien
5e6c9a8f45 [automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 -s ours am: c2de7d994d -s ours
am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 33d861e6a7 is in history

Change-Id: Ic115e06c61f0aa044f8092e38c360056583b5943
2020-05-08 03:11:58 +00:00
Mark Chien
c2de7d994d [automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 -s ours
am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 33d861e6a7 is in history

Change-Id: Iabc445c8067b64cf4c9c10e781e922b8f58d0227
2020-05-08 03:06:42 +00:00
Mark Chien
1d02a79a32 Merge "Refactor the EntitlementManager" into rvc-dev 2020-05-08 03:03:07 +00:00
Mark Chien
e6a025f87f Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882 am: b853a6e5db
Change-Id: Iab830bee6c8b6b021e0682f74a73ebba24364925
2020-05-07 15:42:12 +00:00
Mark Chien
d32231eab0 Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882 am: 271110a1a4
Change-Id: Ia4ce1990845498073d2e4289d4611d15a899f353
2020-05-07 15:36:38 +00:00
Mark Chien
271110a1a4 Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882
Change-Id: Ib0d07f544a37d24f08355f3e3a2afa73fb43868d
2020-05-07 15:31:50 +00:00
Mark Chien
b853a6e5db Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882
Change-Id: I4513b6ad6895b7d2ddeff5405742f578baec700f
2020-05-07 15:31:32 +00:00
TreeHugger Robot
f201e18a0b [automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da -s ours am: 1a682c6155 -s ours
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 0630f383af is in history

Change-Id: I2c6ca6002e56ccd7ee7fa79512bc8cfb9e34efb6
2020-05-07 15:30:22 +00:00
TreeHugger Robot
1def901d22 [automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da am: cb50fc9690 -s ours
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 0630f383af is in history

Change-Id: I7c0fe7a936f93553cf2c505eff8e10c7e0542151
2020-05-07 15:30:02 +00:00
Mark Chien
cca6aad882 Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev 2020-05-07 15:15:59 +00:00
TreeHugger Robot
1a682c6155 [automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da -s ours
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 0630f383af is in history

Change-Id: Ib04a977100b02a93c59ec479e3d85ec13de82c06
2020-05-07 15:03:01 +00:00
TreeHugger Robot
cb50fc9690 Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da
Change-Id: I621dcbf0c11a3220d996c952639383b4351d67fd
2020-05-07 15:03:01 +00:00
Mark Chien
92afd387fd Refactor the EntitlementManager
1. Change ArraySet usage to BitSet
2. Change mCellularUpstreamPermitted to mLastCellularUpstreamPermitted.

Before this change:
a member variable(mCellularUpstreamPermitted) is
used to check whether cellular upstream is permitted, the code must
ensure to update this variable once entitlement result is changed or the
entitlement check is triggered but does not have a result yet.

In this change:
Instead of storing the information about whether cellular is permitted in
a member variable. The information is recalculated every time when user
call isCellularUpstreamPermitted(). Now isCellularUpstreamPermitted() is
always be used to check whether cellular upstream is permitted no matter
inside or outside EntitlementManager.
This make the code be easier to maintain that we do not need to care
when mCellularUpstreamPermitted need to be updated because the
information would be recalculated every time. And the recalculation is
lock free because this is only used inside tethering while running in
the same thread.

Bug: 141256482
Test: atest TetheringTests

Merged-In: Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc
Change-Id: Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc
2020-05-07 14:46:09 +00:00
Jeongik Cha
1aba7987de Use stable networkstack-aidl-interfaces
Test: m nothing
Bug: 133526962
Original-Change: https://android-review.googlesource.com/1301313
Merged-In: I507f40866d04db5ed3361831e01eaa4dfaf20bed
Change-Id: I507f40866d04db5ed3361831e01eaa4dfaf20bed
2020-05-07 11:48:44 +00:00
Mark Chien
e7e06794c8 Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a am: 0245317764
Change-Id: I5b3093d1aa1085293bdc092cc0bdc643669d04cc
2020-05-07 11:27:21 +00:00
Jeongik Cha
d307002162 Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf am: d12236a66f am: 8841f71995
Change-Id: Ife21d79d591d6ce773e0fc550cb2227c3dc28018
2020-05-07 11:26:47 +00:00
Mark Chien
0245317764 Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a
Change-Id: Ib409b85729972e23242551beb39638aaefad0584
2020-05-07 11:26:35 +00:00
Jeongik Cha
8841f71995 Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf am: d12236a66f
Change-Id: Ie5671f3b65a314a1b4f8be9917e02da408e00a53
2020-05-07 11:26:19 +00:00
Mark Chien
407c3afa4a Merge "Refactor the EntitlementManager" am: 581afa0bfa
Change-Id: I20f7b03356592cd184b695e4ceb491d4b04cde14
2020-05-07 11:19:16 +00:00
Mark Chien
581afa0bfa Merge "Refactor the EntitlementManager" 2020-05-07 11:14:40 +00:00
Jeongik Cha
d12236a66f Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf
Change-Id: I278f01d4c8e31913bbc1151bd4733ff8158111d0
2020-05-07 11:12:50 +00:00
Jeongik Cha
3a22b81ccf Merge "Use stable networkstack-aidl-interfaces" 2020-05-07 10:59:05 +00:00
Automerger Merge Worker
1dfe576591 Merge "[automerger skipped] Test tethering log dump am: c96fbe0abe -s ours am: a77b290247 -s ours" into rvc-d1-dev-plus-aosp 2020-05-07 08:33:16 +00:00
Mark Chien
55e5032535 [automerger skipped] Test tethering log dump am: c96fbe0abe -s ours am: a77b290247 -s ours
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 146f6055bd is in history

Change-Id: I78de8e3ee799516adfddc81388811f1521949a8a
2020-05-07 08:33:06 +00:00
Mark Chien
dbba20fcf2 [automerger skipped] Test tethering log dump am: c96fbe0abe am: 044a749f37 -s ours
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 146f6055bd is in history

Change-Id: Iddc0c3ca3f9d23518c95caf4bb31d0e60fcbe2bd
2020-05-07 08:32:53 +00:00
Jooyung Han
8182d8bd56 Set min_sdk_version for updatable mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 145796956
Bug: 150999716
Test: m
Change-Id: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
2020-05-07 17:30:00 +09:00
Mark Chien
a77b290247 [automerger skipped] Test tethering log dump am: c96fbe0abe -s ours
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 146f6055bd is in history

Change-Id: I208b2d702643e72dedb821c2517ef1f32b12e5ef
2020-05-07 08:19:22 +00:00
Mark Chien
044a749f37 Test tethering log dump am: c96fbe0abe
Change-Id: If48c35a4dde54b4bdd44703f3df6338267b1b542
2020-05-07 08:19:10 +00:00
Mark Chien
c96fbe0abe Test tethering log dump
Bug: 145490751
Test: atest TetheringTests
Merged-In: I01fc6969041711f7a15880144ee5eac591086ecd
Change-Id: I01fc6969041711f7a15880144ee5eac591086ecd
2020-05-07 06:44:43 +00:00