summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-13Snap for 8076125 from 4aee94d81e44f1764704274d361312f9721db7e7 to ↵android-mainline-12.0.0_r94android12-mainline-resolv-releaseAndroid Build Coastguard Worker
mainline-resolv-release Change-Id: I678adbfeafd4995ca765f4b01e1646d26c918fe5
2021-12-14switch to using OWNERS from master branch of Connectivity module am: ↵Maciej Żenczykowski
3e9b9613c2 am: 2001287867 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1894907 Change-Id: I92f24f261126b360a526bce412ba3c9b20bfc986
2021-12-14[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a ↵Xin Li
-s ours am: f3e52a1f46 -s ours am: 54929f253a -s ours am skip reason: Merged-In I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e with SHA-1 c035a4f6c1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1847388 Change-Id: Id890bb20dff5b53a8994d7bec19ea2658f2c23e9
2021-12-14Cleanup empty class in NetworkPermissionConfig am: a46f16d7ec am: c035a4f6c1 ↵Chiachang Wang
am: 918c68cf07 am: 88dcc206b3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1836236 Change-Id: I7c678a724bff481b286a7dd78b8e655f00268b76
2021-12-14Mark NetworkPermissionConfig as coreApp am: d3ec462f64 am: 4a34bddde3 am: ↵Remi NGUYEN VAN
bc57e6e191 am: 3700e090d5 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1808559 Change-Id: I209f8226d532bd81cb4260222f4d74973a650f0f
2021-12-14[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e992a3925f -s ours am: ad7187e8e1 -s ours am: 30563abf78 -s ours am skip reason: Merged-In I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c with SHA-1 a3d6942d48 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/15571818 Change-Id: Ib28ffa56759068f78cf8b36fa3d31d41b0693677
2021-12-09Snap for 7984612 from abc0fdec545a92f1d128449d24780d5437ba097c to ↵android-mainline-12.0.0_r80android-mainline-12.0.0_r65Android Build Coastguard Worker
mainline-resolv-release Change-Id: I32983144701bffc26ee2a0ec86049aa491cf59d4
2021-11-17switch to using OWNERS from master branch of Connectivity module am: 3e9b9613c2android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1894907 Change-Id: Ia958d768f5598b88d1c2f6212ebcb267b29ba98b
2021-11-17switch to using OWNERS from master branch of Connectivity module am: 3e9b9613c2Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1894907 Change-Id: I49c20d18d4fbc6d1c300503a5b0499d2edad4ef2
2021-11-17switch to using OWNERS from master branch of Connectivity moduleMaciej Żenczykowski
Test: N/A Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Iceab1f9fc99c61174b2ba05bc3b7a207266bddc1
2021-10-12Snap for 7814173 from f6397f904492bc68187312d83a9fb431331594a7 to ↵android-mainline-12.0.0_r52android-mainline-12.0.0_r35Android Build Coastguard Worker
mainline-resolv-release Change-Id: I39d0f3bd49f01676d5161f539d34c9c64e745cae
2021-10-08[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a ↵Xin Li
-s ours am: f3e52a1f46 -s ours am skip reason: Merged-In I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e with SHA-1 c035a4f6c1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1847388 Change-Id: I8d8de88e8683d7069b5a67effce2467f24fee111
2021-10-08[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a ↵Xin Li
-s ours am skip reason: Merged-In I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e with SHA-1 c035a4f6c1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1847388 Change-Id: I62e31350dfc8af98a9200e3e287713f044ea1fb7
2021-10-08[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a ↵Xin Li
-s ours am skip reason: Merged-In I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e with SHA-1 c035a4f6c1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1847388 Change-Id: Ib4034ba9ed01729e1b9300999e29f3fd8dbcfb2e
2021-10-08[automerger skipped] Merge Android 12 am: b03d5e97c5 -s oursXin Li
am skip reason: Merged-In I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e with SHA-1 c035a4f6c1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1847388 Change-Id: I1615545475c3885e840304ca186555771f14f17f
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e Change-Id: Ia327c49c23fcf9593c8afaffb23480d53783a7ae
2021-10-06Snap for 7798373 from 408042a7fa24d99438a6877862983e3c9506483d to ↵Android Build Coastguard Worker
mainline-resolv-release Change-Id: I9e6a940e6a6c1e05b6341b61357c99b07e9681ff
2021-10-01Cleanup empty class in NetworkPermissionConfig am: a46f16d7ec am: c035a4f6c1 ↵Chiachang Wang
am: 918c68cf07 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1836236 Change-Id: I99d03a9ad771ba2bbb8795631de85f225bb80a2e
2021-10-01Cleanup empty class in NetworkPermissionConfig am: a46f16d7ec am: c035a4f6c1Chiachang Wang
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1836236 Change-Id: I14224458f3de152e2551441b6bb787525d1a25ca
2021-10-01Cleanup empty class in NetworkPermissionConfig am: a46f16d7ec am: c035a4f6c1Chiachang Wang
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1836236 Change-Id: Iad7da38075bd8905e60bb00695649403f6649059
2021-10-01Cleanup empty class in NetworkPermissionConfig am: a46f16d7ectemp_sam_202323961Chiachang Wang
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1836236 Change-Id: I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e
2021-09-24Cleanup empty class in NetworkPermissionConfigChiachang Wang
The previous issue was resolved so that NetworkPermissionConfig could be built as a no-code app. Cleanup the code accordingly to reduce the apk size. The apk size is reduced from 16.8kB to 12.6kB from local build. Bug: 132924647 Test: atest NetworkStackTests Test: Build, flash, connect to wifi/cellular normally Change-Id: Ibc66e87832253ed0d022753f66141743c5a770dd
2021-09-09Snap for 7716385 from 1e07a915027a2ae8b94ca7789fd04211101b0f99 to ↵android-mainline-12.0.0_r16Android Build Coastguard Worker
mainline-resolv-release Change-Id: Ib30e0201cb9a69a618fa90c0f4c6df8ce84b7881
2021-08-27Mark NetworkPermissionConfig as coreApp am: d3ec462f64 am: 4a34bddde3 am: ↵Remi NGUYEN VAN
bc57e6e191 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1808559 Change-Id: Ibfe2c2b00905e67737b221f48d5c22b21c0c1f25
2021-08-27Mark NetworkPermissionConfig as coreApp am: d3ec462f64 am: 4a34bddde3Remi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1808559 Change-Id: Ib9a8f7701a21e72e563b561dab9e61f97cc4380c
2021-08-27Mark NetworkPermissionConfig as coreApp am: d3ec462f64 am: 4a34bddde3Remi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1808559 Change-Id: Iba434d92a2b00bfa60e25c11e96b861c1f25a5a4
2021-08-27Mark NetworkPermissionConfig as coreApp am: d3ec462f64Remi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1808559 Change-Id: I306bb521e7896aa9c8b7482ccca8de9fa13b0bde
2021-08-26Mark NetworkPermissionConfig as coreAppandroid-s-beta-5android-s-beta-5Remi NGUYEN VAN
NetworkPermissionConfig needs to be a coreApp just like NetworkStack, so that the MAINLINE_NETWORK_STACK permission can be protected and obtained by NetworkStack in encrypting mode where only coreApps are loaded. Bug: 197282772 Test: m; device boots and has connectivity; encrypting mode manual tests done by partner Change-Id: Ie4d7a1ca581e557f82e9a5d9c264891e2bd2df98
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e992a3925f -s ours am: ad7187e8e1 -s ours am skip reason: Merged-In I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c with SHA-1 a3d6942d48 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/15571818 Change-Id: I5359ef204b0b348055f127847cd1737604f60f23
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e992a3925f -s ours am skip reason: Merged-In I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c with SHA-1 a3d6942d48 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/15571818 Change-Id: Ifce7b5a99bc39735c981c42776ee5c960a1e48c7
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e992a3925f -s ours am skip reason: Merged-In I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c with SHA-1 a3d6942d48 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/15571818 Change-Id: I2be8b871f5e7e265b1c336ba082fe5122face617
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li
Merged-In: I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c Change-Id: I8305f8550f0a33d0b5a98035d040ef1ca2bf7a72
2021-07-15Snap for 7550930 from 7b8865ceab76147c2a5b62d242b768dbc3d3466d to ↵Android Build Coastguard Worker
mainline-resolv-release Change-Id: I7a9e46bd9118da94873872236ae1c94ef37e4c61
2021-03-10Snap for 7196747 from cb9ba1f6e948f257af34875bcbba04c731640429 to ↵android-mainline-11.0.0_r21android-build-team Robot
mainline-resolv-release Change-Id: I7f2f3a5aa88cc278a42fb14109279d9a2ac275e9
2021-02-23[automerger skipped] DO NOT MERGE [LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/modules/NetworkPermissionConfig am: cb9ba1f6e9 -s ours am: a3d6942d48 -s ours am skip reason: Change-Id Ia5f67ade5e9185bdd78786e9edd69684295f54d9 with SHA-1 d16a1c4067 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13666413 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2aeec857e75209822d6b43788839727802dd8160
2021-02-23[automerger skipped] DO NOT MERGE [LSC] Add LOCAL_LICENSE_KINDS to ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devBob Badour
packages/modules/NetworkPermissionConfig am: cb9ba1f6e9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13666413 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c
2021-02-22DO NOT MERGE [LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/modules/NetworkPermissionConfig Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia411e6944fab1a75ce2977856bdf4fbcd11c9e85 Merged-in: I04526bd6ab76afdaee0d4eb8b80602ddc58a083b Merged-in: Ia5f67ade5e9185bdd78786e9edd69684295f54d9
2021-02-23[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/NetworkPermissionConfig ↵Bob Badour
am: d16a1c4067 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13666420 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iccf1af226612a7c0f28d1c531ecc1df801e67839
2021-02-22[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/NetworkPermissionConfigBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia5f67ade5e9185bdd78786e9edd69684295f54d9
2021-02-22[automerger skipped] Skip ab/7061308 in stage. am: 9d4dedf72d am: 28de3828e0 ↵Xin Li
-s ours am: 7760d766d8 -s ours am skip reason: Change-Id Iff32a60f6e88645ca4cf6eb6baec750bbb7693ee with SHA-1 4f7565fe89 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13658381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4161cedc8e930aa56ad7aa627059b1b5e9a5ace2
2021-02-22[automerger skipped] Skip ab/7061308 in stage. am: 9d4dedf72d am: 28de3828e0 ↵Xin Li
-s ours am skip reason: Change-Id Iff32a60f6e88645ca4cf6eb6baec750bbb7693ee with SHA-1 4f7565fe89 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13658381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic727470c1eef0805374e6e1b94510122ccd50328
2021-02-22[automerger skipped] Skip ab/7061308 in stage. am: 9d4dedf72d -s ours am: ↵Xin Li
48fea53a8d -s ours am: 3c3bc61233 -s ours am skip reason: Change-Id Iff32a60f6e88645ca4cf6eb6baec750bbb7693ee with SHA-1 4f7565fe89 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13658381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a32130e0ec3961081f41624c4636a7036782a84
2021-02-22[automerger skipped] Skip ab/7061308 in stage. am: 9d4dedf72d -s ours am: ↵Xin Li
48fea53a8d -s ours am skip reason: Change-Id Iff32a60f6e88645ca4cf6eb6baec750bbb7693ee with SHA-1 4f7565fe89 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13658381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic8568b456b95e6ff575f75db026aa8b57f8ffbc5
2021-02-22[automerger skipped] Skip ab/7061308 in stage. am: 9d4dedf72d -s oursXin Li
am skip reason: Change-Id Iff32a60f6e88645ca4cf6eb6baec750bbb7693ee with SHA-1 4f7565fe89 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13658381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia7985a18c23d2828b416b1f00db1d4422e88bc69
2021-02-22Skip ab/7061308 in stage. am: 9d4dedf72dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/13658381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic174b5c36579162fc1789c3ef727eb3b30c77610
2021-02-21Skip ab/7061308 in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Iff32a60f6e88645ca4cf6eb6baec750bbb7693ee Change-Id: Ib5afbc0e0d358ce034fe52b9958df2f7da428f1d
2021-02-21[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/modules/NetworkPermissionConfig am: 968beabf05 am: 49ac05b16e am: a3c826de21 -s ours am: 00c1e910ad -s ours am skip reason: Change-Id I2c244b63b0719e3bfc1df823ab8deef6db29472a with SHA-1 a40b0625b0 is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1588505 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c13830de7dbed16a9e0a03d175b925f07466d74
2021-02-21[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/modules/NetworkPermissionConfig am: 968beabf05 am: 49ac05b16e am: a3c826de21 -s ours am skip reason: Change-Id I2c244b63b0719e3bfc1df823ab8deef6db29472a with SHA-1 a40b0625b0 is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1588505 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie93bf57f52dfea1e8eea89976ac6fc31a0979249
2021-02-19[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/modules/NetworkPermissionConfig am: 968beabf05 am: 49ac05b16e -s ours am: 1bae483aa4 -s ours am: d03b8bb4a4 -s ours am skip reason: Change-Id I2c244b63b0719e3bfc1df823ab8deef6db29472a with SHA-1 a40b0625b0 is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1588505 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib40dda02a6511f192d8174937be1a41cf23ced10
2021-02-19[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/modules/NetworkPermissionConfig am: 968beabf05 am: 49ac05b16e -s ours am: 1bae483aa4 -s ours am skip reason: Change-Id I2c244b63b0719e3bfc1df823ab8deef6db29472a with SHA-1 a40b0625b0 is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1588505 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iab09b3a5121aa44f44f3d00a5036639f45b08d62
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 18:40:54 +0000