Commit Graph

1055 Commits

Author SHA1 Message Date
Anton Hansson
49b14f7a76 Disallow use of error-prone merge-strategies am: 6631354fb3 am: 43f8af4e49
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1602054

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf3bdec14fb2d25eb2912a7eaf16292636cc46ce
2021-02-23 19:37:49 +00:00
Anton Hansson
43f8af4e49 Disallow use of error-prone merge-strategies am: 6631354fb3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1602054

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie50b66c4ab106e2d66d5598357edc78e32705749
2021-02-23 19:10:44 +00:00
Anton Hansson
6631354fb3 Disallow use of error-prone merge-strategies
Test: No
Change-Id: I2ed682c013e9bf0bfe43270382fcb8f9cec24e10
2021-02-23 15:04:32 +00:00
Bob Badour
1f3de72851 [automerger skipped] DO NOT MERGE [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: e64f954099 -s ours am: 4812caf753 -s ours
am skip reason: Change-Id Ibcce51ccaa3a10cfe862531d3b924f14bdd40f0b with SHA-1 d31d716ab7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67f7714dc433da7cf09da41e3740f1c76dd2e41b
2021-02-23 10:19:20 +00:00
Bob Badour
4812caf753 [automerger skipped] DO NOT MERGE [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: e64f954099 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2e84d25bc71a427357206e3a4316a04d8ea34ce
2021-02-23 08:44:57 +00:00
Bob Badour
e64f954099 DO NOT MERGE [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common
Added SPDX-license-identifier-Apache-2.0 to:
  java/com/android/modules/annotation/Android.bp
  sdk/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I2b4a766e94a70645b49ddbaba63509057a286856
Merged-in: Ia45708593b339ddbc4e7643b9974bf60fd9a4e2d
Merged-in: Ibcce51ccaa3a10cfe862531d3b924f14bdd40f0b
2021-02-22 21:56:46 -08:00
Bob Badour
e68fc4cd5b [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: d31d716ab7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/13665296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If68ac08afa5f729c712eaeb0edf93bcaa9e6024c
2021-02-23 05:19:30 +00:00
Bob Badour
d31d716ab7 [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common
Added SPDX-license-identifier-Apache-2.0 to:
  java/com/android/modules/annotation/Android.bp
  sdk/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ibcce51ccaa3a10cfe862531d3b924f14bdd40f0b
2021-02-22 16:14:12 -08:00
Bob Badour
dff871640e [automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: f3aa76929d am: abde91d556 am: ab7069f64a -s ours am: 906b819323 -s ours
am skip reason: Change-Id I2934cb172c2a335a8fa0044219f362d80cb44a0e with SHA-1 a330250407 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifff987145df2071dae6b034847d6eaa3a46a9097
2021-02-21 20:09:41 +00:00
Bob Badour
906b819323 [automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: f3aa76929d am: abde91d556 am: ab7069f64a -s ours
am skip reason: Change-Id I2934cb172c2a335a8fa0044219f362d80cb44a0e with SHA-1 a330250407 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7c8f2dfc05a3d4a2bf4b2205217dbf3c2484353
2021-02-21 19:04:28 +00:00
Bob Badour
704619a362 [automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: f3aa76929d am: abde91d556 -s ours am: 49c24e014a -s ours am: ced992db6a -s ours
am skip reason: Change-Id I2934cb172c2a335a8fa0044219f362d80cb44a0e with SHA-1 a330250407 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c3ec2e48f4e32769cf2901b33d9a9d6982184c8
2021-02-19 09:17:15 +00:00
Bob Badour
ced992db6a [automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: f3aa76929d am: abde91d556 -s ours am: 49c24e014a -s ours
am skip reason: Change-Id I2934cb172c2a335a8fa0044219f362d80cb44a0e with SHA-1 a330250407 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00a830fa78d091b0767e868d95c90a86bad384c9
2021-02-19 08:29:50 +00:00
Bob Badour
ab7069f64a [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: f3aa76929d am: abde91d556
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1588534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8aaaeb7a3f9a19a4b4438f7c6b87a1b14d6850e
2021-02-19 07:48:41 +00:00
Bob Badour
49c24e014a [automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: f3aa76929d am: abde91d556 -s ours
am skip reason: Change-Id I2934cb172c2a335a8fa0044219f362d80cb44a0e with SHA-1 a330250407 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48f931e1a7fef9f72c84edcf3056e78dbc09a5ec
2021-02-19 07:46:25 +00:00
Bob Badour
abde91d556 [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: f3aa76929d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1588534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic48c0cea8cf8f53f62438c73f228b011fb761ce1
2021-02-19 06:54:36 +00:00
Bob Badour
f3aa76929d [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common
Added SPDX-license-identifier-Apache-2.0 to:
  java/com/android/modules/annotation/Android.bp
  sdk/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work

Change-Id: Ia45708593b339ddbc4e7643b9974bf60fd9a4e2d
Merged-in: I2934cb172c2a335a8fa0044219f362d80cb44a0e
2021-02-17 09:46:27 -08:00
Remi NGUYEN VAN
6876317b2e Add visibility for packages/Connectivity am: bf85235779 am: d74c3debca am: 579a5f498f am: 81022927cb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1591671

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b2e9c4a20bbcacb793e891d60947d30611f7e12
2021-02-17 12:13:53 +00:00
Remi NGUYEN VAN
13e8fcc120 Add visibility for packages/Connectivity am: bf85235779 am: d74c3debca am: c3d8e5291f am: 36b381b4e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1591671

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f10edf12af7a2bb8fe256cff16511d25f1d89ad
2021-02-17 12:13:44 +00:00
Remi NGUYEN VAN
81022927cb Add visibility for packages/Connectivity am: bf85235779 am: d74c3debca am: 579a5f498f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1591671

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd27027a047ab6170a766416ce456831b4d4b17a
2021-02-17 11:49:12 +00:00
Remi NGUYEN VAN
36b381b4e9 Add visibility for packages/Connectivity am: bf85235779 am: d74c3debca am: c3d8e5291f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1591671

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c2d78ba2c87a3080fde7f0e8a4d3d32dd5bcabe
2021-02-17 11:44:25 +00:00
Remi NGUYEN VAN
579a5f498f Add visibility for packages/Connectivity am: bf85235779 am: d74c3debca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1591671

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7556942dd8483951aeaac2e46d30fc44a82a7f9a
2021-02-17 11:08:39 +00:00
Remi NGUYEN VAN
c3d8e5291f Add visibility for packages/Connectivity am: bf85235779 am: d74c3debca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1591671

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56d469fa060d450396827867040c154441f96e0d
2021-02-17 11:05:09 +00:00
Remi NGUYEN VAN
d74c3debca Add visibility for packages/Connectivity am: bf85235779
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1591671

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98725d1df92089492de6649c0ff7d7b7b5273bda
2021-02-17 10:30:39 +00:00
Remi NGUYEN VAN
bf85235779 Add visibility for packages/Connectivity
For modularization of connectivity classes, connectivity classes in
frameworks/base are planned to move to packages/modules/Connectivity.
To facilitate the work, classes are first moved to
frameworks/base/packages/Connectivity, so they can then be moved all
together with their history to packages/modules/Connectivity.

Bug: 171540887
Test: m
Change-Id: I78c7adbfe2242b1d3179d07d3cb1f0ff8a203d65
2021-02-17 12:27:42 +09:00
TreeHugger Robot
6785e93451 Merge "Add generate_ml_bundle.sh." into sc-dev 2021-02-10 22:20:37 +00:00
Hai Zhang
2c1e625299 Add generate_ml_bundle.sh.
This is based on Anton's script and modified to support
framework-permission-s.

Bug: 177884752
Test: manual
Test: prebuilts/sdk/update_prebuilts/update_prebuilts.py -f 31 7126175
Test: packages/modules/common/generate_ml_bundle.sh ../../../ ../../../ 31
Change-Id: Ie32aa820b3589d68545c1a11c098dbd3be4f92ff
2021-02-10 12:46:44 -08:00
Treehugger Robot
f8d412c20f Merge "Add MinSdk annotation." am: e7bc7e2af1 am: 3e6dcd2db7 am: 7ba94f5e43
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1567621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9afca4791381d2b46a2a270c6f131ddb93982e6
2021-02-10 16:44:45 +00:00
Treehugger Robot
95041f8211 Merge "Add MinSdk annotation." am: e7bc7e2af1 am: 3e6dcd2db7 am: a330250407
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1567621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02f8d68e698385617ac2875179422cc4a41927f8
2021-02-10 16:42:49 +00:00
Treehugger Robot
a330250407 Merge "Add MinSdk annotation." am: e7bc7e2af1 am: 3e6dcd2db7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1567621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2934cb172c2a335a8fa0044219f362d80cb44a0e
2021-02-10 15:49:30 +00:00
Treehugger Robot
7ba94f5e43 Merge "Add MinSdk annotation." am: e7bc7e2af1 am: 3e6dcd2db7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1567621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I958598b2f99d0ed3ac8977dc07d7cb4a0c473a1c
2021-02-10 15:49:26 +00:00
Treehugger Robot
3e6dcd2db7 Merge "Add MinSdk annotation." am: e7bc7e2af1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1567621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e5eab59107c634f0d0155a03382e53596e3ca8d
2021-02-10 15:23:54 +00:00
Treehugger Robot
e7bc7e2af1 Merge "Add MinSdk annotation." 2021-02-10 14:45:26 +00:00
Mathew Inwood
f0fe178b84 Add MinSdk annotation.
Bug: 177884215
Test: m modules-annotation-minsdk-soong
Change-Id: I8bf4d5c05450e8255daa2b291373ecf32775f8a8
2021-02-10 13:28:55 +00:00
Anton Hansson
c32bbe49d1 Remove reference to whitelist am: ebcfa668d0 am: cbe669b2d7 am: bcd19c3d13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1570643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic13eca3a0cbcc67f90f320401e5342ce1b92b6d5
2021-02-08 20:21:01 +00:00
Anton Hansson
ebd1bcfd6a Remove reference to whitelist am: ebcfa668d0 am: cbe669b2d7 am: f80a2520a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1570643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26a01c81d89f2eaea9aa08a5295713dcb187f796
2021-02-08 20:19:34 +00:00
Anton Hansson
bcd19c3d13 Remove reference to whitelist am: ebcfa668d0 am: cbe669b2d7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1570643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee784debc7c734c0d4b9d5ee9a726d960822bd18
2021-02-08 19:43:00 +00:00
Anton Hansson
f80a2520a6 Remove reference to whitelist am: ebcfa668d0 am: cbe669b2d7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1570643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedd2d547d640d3564e03883be2695b4b609d50d7
2021-02-08 19:39:53 +00:00
Anton Hansson
cbe669b2d7 Remove reference to whitelist am: ebcfa668d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1570643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1b78d606d3ba77fb151ed221b7a6a058266c335
2021-02-08 19:18:22 +00:00
Anton Hansson
7f20eb9992 [automerger skipped] Move shared module build rules to common repo am: e7a9d09ac5 am: 971c4f8a4b -s ours am: 34e56d6e09 -s ours
am skip reason: Change-Id I1cf8cbbccf042a8503bf751ab057742cca357585 with SHA-1 b0e52fbb3a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe1fd2633a64fb0a865c513319dc6a990e1de8a8
2021-02-05 14:57:57 +00:00
Anton Hansson
a8238d9c54 [automerger skipped] Move shared module build rules to common repo am: e7a9d09ac5 am: 971c4f8a4b am: b01ea9ebd5 -s ours
am skip reason: Change-Id I1cf8cbbccf042a8503bf751ab057742cca357585 with SHA-1 b0e52fbb3a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc76add375332b43b6da90cb48e5741b102399eb
2021-02-05 14:21:15 +00:00
Anton Hansson
b01ea9ebd5 Move shared module build rules to common repo am: e7a9d09ac5 am: 971c4f8a4b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1570641

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7ca211cafe4e79cd8b6638000a7b2e076e0fa21
2021-02-05 13:41:15 +00:00
Anton Hansson
34e56d6e09 [automerger skipped] Move shared module build rules to common repo am: e7a9d09ac5 am: 971c4f8a4b -s ours
am skip reason: Change-Id I1cf8cbbccf042a8503bf751ab057742cca357585 with SHA-1 bd9ecbefc9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2136d2afd93d1fb5c6fd7dcccaffd8fecf644637
2021-02-05 13:39:07 +00:00
Anton Hansson
971c4f8a4b Move shared module build rules to common repo am: e7a9d09ac5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1570641

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ce81862c65d0e559283182b645d484826c46198
2021-02-05 13:24:13 +00:00
Anton Hansson
e219adc1e0 Move shared module build rules to common repo am: bd9ecbefc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/13473986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63764b01e2aede17cb0dd4d4f15779d1c8141044
2021-02-04 18:31:48 +00:00
Anton Hansson
2bb6ff710a Add OWNERS for module common repo am: a79d61ed38 am: aab15c10b8 am: 81680b310a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1566095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1ba789fb9cb107d326721e3e5a05432bf314286
2021-02-04 18:27:12 +00:00
Anton Hansson
b0e52fbb3a Move shared module build rules to common repo
This decouples modules from frameworks/base, and this repo also has
a different automerger strategy.

Add //frameworks/base/apex:__subpackages__ to the defaults_visibility
to preserve the existing behavior.

Bug: 179377774
Test: m
Merged-In: I1cf8cbbccf042a8503bf751ab057742cca357585
Change-Id: I1cf8cbbccf042a8503bf751ab057742cca357585
(cherry picked from commit bd9ecbefc9)
2021-02-04 16:18:06 +00:00
Anton Hansson
ebcfa668d0 Remove reference to whitelist
Test: No
Change-Id: I402c1a2e9f9e0e26124d5fb807dff353136699a5
2021-02-03 18:59:14 +00:00
Anton Hansson
bd9ecbefc9 Move shared module build rules to common repo
This decouples modules from frameworks/base, and this repo also has
a different automerger strategy.

Add //frameworks/base/apex:__subpackages__ to the defaults_visibility
to preserve the existing behavior.

Test: m
Change-Id: I1cf8cbbccf042a8503bf751ab057742cca357585
2021-02-03 18:57:25 +00:00
Anton Hansson
e7a9d09ac5 Move shared module build rules to common repo
This decouples modules from frameworks/base, and this repo also has
a different automerger strategy.

Add //frameworks/base/apex:__subpackages__ to the defaults_visibility
to preserve the existing behavior.

Test: m
Merged-In: I1cf8cbbccf042a8503bf751ab057742cca357585
Change-Id: I1cf8cbbccf042a8503bf751ab057742cca357585
2021-02-03 16:56:06 +00:00
Anton Hansson
7c551a096a Add OWNERS for module common repo am: a79d61ed38 am: aab15c10b8 am: b161a79e06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1566095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I796e04649e8b031f182571e30580c220509808c6
2021-01-30 01:24:16 +00:00