Age | Commit message (Collapse) | Author |
|
am: 9465f1fec4 -s ours am: 268a5409d5 -s ours am: 69bf6a3e63 -s ours am: ee28e01999 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427
Change-Id: Id66fb55cb6a78f0e95d3c1cb87adbb04f4a9d172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
cab76eeaa3 -s ours am: 0bd88bc883 -s ours am: 42026683c6 -s ours am: ed31619b42 -s ours am: 0569b1267f -s ours
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/19094502
Change-Id: I18dd35b0120f4afcf182bbabd947acd5896a8336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
b7edf74668 -s ours am: 375f4466c1 -s ours am: b81c1b0d9f -s ours am: 0a2972886b -s ours am: 8a08487be2 -s ours
am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: I82f3afea973576fd98ed0c96bbd6425610eac12e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 9465f1fec4 -s ours am: 268a5409d5 -s ours am: 69bf6a3e63 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427
Change-Id: Ie83f01d37be924c746aec1dfd2b922f1ae022ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
cab76eeaa3 -s ours am: 0bd88bc883 -s ours am: 42026683c6 -s ours am: ed31619b42 -s ours
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/19094502
Change-Id: Iea957685323c197a38a06d11c4d5f5d46faf6d14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
b7edf74668 -s ours am: 375f4466c1 -s ours am: b81c1b0d9f -s ours am: 0a2972886b -s ours
am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: Ie0b24973c84275ea9ab2083bbfcbfe1f837dab0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/20914133
Change-Id: I42691509e848107c0536d5e68bf703f573823fda
|
|
Change-Id: Ief3854e59f9f20f3800580da05f162690fc5d543
|
|
into tm-d1-dev-plus-aosp am: 6684b1d738 am: dadf92fb55 am: 1e7c1920bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: I3d00f093d832809ab0ca8f618b8a3e5b0982b381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 08c642cf4b" into tm-qpr-dev-plus-aosp am: a600fc9239 am: d9497df14b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: Idbdb4c33473e01c61b93f4a4ff283aef62d0ad9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
99a7b05e8e am: 8a0c338e2f am: ea0e6b79f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: I4aec1740b892971c432be69a3e6961034eba59c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
into tm-d1-dev-plus-aosp am: 6684b1d738 am: dadf92fb55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: I0fb0a41fc05d10bfd4857d90cc9d0ef7d131c28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 08c642cf4b" into tm-qpr-dev-plus-aosp am: a600fc9239
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: Iede7c9be9f84ee7354ae0365fb597fe915f21999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
99a7b05e8e am: 8a0c338e2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: Ie560ee32f8a7cbef4ab662533f2c37d2ca9e42d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 9465f1fec4 -s ours am: 268a5409d5 -s ours am: 69bf6a3e63 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427
Change-Id: Idce1fc06018f31a8cdf1acdfa6534e00a1470e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 9465f1fec4 -s ours am: 268a5409d5 -s ours
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427
Change-Id: I76a9b69905bc2af07dfe977d7596c9c55ef239ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 9465f1fec4 -s ours
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427
Change-Id: I0c3c59449e4155fce42202e328d3ae2ffbe090f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427
Change-Id: I4a77c64c074d1e5dda3e422dfd5290ee106ce23b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 94d2b5f731 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427
Change-Id: I59b1e69fddd8e4191143b17a14624c150e35d904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
ours
am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: I249048990c42901b0f485ab819b3e9bc30d160f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427
Change-Id: Id91084dd411efb92053dfaeb45bf8f300a57461e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 242648940
Merged-In: Idefa84f401ed0882ee1a3b799bb66c665174a641
Change-Id: Ieca85f86ba56e4a439386d33461f24faa5c88d24
|
|
cab76eeaa3 -s ours am: 0bd88bc883 -s ours am: 42026683c6 -s ours am: ed31619b42 -s ours
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/19094502
Change-Id: I7d2b64f046654d5a3b24a70a22ba4285846c78b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
cab76eeaa3 -s ours am: 0bd88bc883 -s ours am: 42026683c6 -s ours
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/19094502
Change-Id: I87225de2735f4eeb8e4ff3a1647592d42368b44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
cab76eeaa3 -s ours am: 0bd88bc883 -s ours
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/19094502
Change-Id: I2b44bab67bc9aef33d26674772817f225d22c67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
cab76eeaa3 -s ours
am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/19094502
Change-Id: Ie6873247d3c3ff725e392099d36482971a6c0ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 236760014
Merged-In: Idefa84f401ed0882ee1a3b799bb66c665174a641
Change-Id: I1fed3e4e303c8d2a47170702e9b115cf8556e336
|
|
b7edf74668 -s ours am: 375f4466c1 -s ours am: b81c1b0d9f -s ours am: 0a2972886b -s ours
am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: I00d928851b72c78afa5ce9382a5a88dab242dbc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
b7edf74668 -s ours am: 375f4466c1 -s ours am: b81c1b0d9f -s ours
am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: I1d835c0ece898775fb7de51d15c64af3094cb733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
b7edf74668 -s ours am: 375f4466c1 -s ours
am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: Iff9b6df0076242108a9a9096d7a0da4c2b2e8cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: Id2193b6466b2f3d620febef6692f3f8fefd6df89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
b7edf74668 -s ours
am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: I9f52b7d31bbf379322fe5573ba92e88e09669e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2126234
Change-Id: I8ac08c55b12881ef3b40c9e6a48a92b15aa2b7e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 236045730
Merged-In: Idde105d06c394cb00c135969288dd2ec45f7cea4
Change-Id: Ia4dbfd52cd6472b0de2ac582941789cccc73bb5c
|
|
-s ours am: c91032a71a -s ours
am skip reason: Merged-In I96d60e60255f66b0356f04aeccac1d8eaed8c88b with SHA-1 6efe9ff82d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2111344
Change-Id: I465bd49e5bb9ba67382b1264ddc470e5f4d534d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours am: ec71f3f5eb -s ours am: b6ce34259c -s ours am: 408cbfa132 -s ours am: b06e61d6c8 -s ours
am skip reason: Merged-In I2c8ddf4737667a9be6cae559599211e71d4afe2b with SHA-1 b4fba7a9bb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2111344
Change-Id: I24b6af0c6f18b049f75a57b18927cda017cf3714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours am: ec71f3f5eb -s ours am: b6ce34259c -s ours am: 408cbfa132 -s ours
am skip reason: Merged-In I2c8ddf4737667a9be6cae559599211e71d4afe2b with SHA-1 b4fba7a9bb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2111344
Change-Id: I9c774738ac9cd047b09a402b25f705f4a80a2909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours am: ec71f3f5eb -s ours am: b6ce34259c -s ours
am skip reason: Merged-In I2c8ddf4737667a9be6cae559599211e71d4afe2b with SHA-1 b4fba7a9bb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2111344
Change-Id: I1dee4a2a567b34c8f461a34fc187acbab98097af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours am: ec71f3f5eb -s ours
am skip reason: Merged-In I2c8ddf4737667a9be6cae559599211e71d4afe2b with SHA-1 b4fba7a9bb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2111344
Change-Id: I70eea58d067b4f9f5437baa27fed1c4a771f4dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours
am skip reason: Merged-In I2c8ddf4737667a9be6cae559599211e71d4afe2b with SHA-1 b4fba7a9bb is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2111344
Change-Id: Idde105d06c394cb00c135969288dd2ec45f7cea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours
am skip reason: Merged-In I96d60e60255f66b0356f04aeccac1d8eaed8c88b with SHA-1 6efe9ff82d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2111344
Change-Id: I71630f4b40a4136429355ce156576586d4c192bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Move declaration of MAINLINE_NETWORK_STACK permission from the
NetworkPermissionConfig package to the NetworkStack package.
Bug: 223649084
Test: m
Merged-In: I96d60e60255f66b0356f04aeccac1d8eaed8c88b
(cherry picked from 6efe9ff82d354f27b10c4687d212bb77e1efccac)
Merged-In: I2c8ddf4737667a9be6cae559599211e71d4afe2b
Change-Id: Idefa84f401ed0882ee1a3b799bb66c665174a641
|
|
into tm-d1-dev-plus-aosp am: 6684b1d738 am: dadf92fb55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: I9fb29613182a651b24369feb767519a70ab3a54d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 08c642cf4b" into tm-qpr-dev-plus-aosp am: a600fc9239
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: I12575a886dc80b1946aee74368cb6cc79b823fcc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
99a7b05e8e am: 8a0c338e2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: Ifedccd18d2a1774cefa59bc2bd002ea50990b648
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: I62fd98dbf69a6fa9c5e4ffa8d9382ec0602f4f70
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
into tm-d1-dev-plus-aosp am: 6684b1d738
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: Idedf5a2412b8b8da05ddd2649b274906cedecd8d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 08c642cf4b" into tm-qpr-dev-plus-aosp
|
|
08c642cf4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: Ib598543a99d539e9d243616b677e3507749bb10b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
99a7b05e8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/17822092
Change-Id: I995c9b732d7d203e8a3693f57e160f2a62fa84e5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|