Bo Hu
ac33f427ab
Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f am: 3c2d039c54 am: 222f23559e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437
Change-Id: I869353dc0ced4bdbe826c103b94d455ca281f4c6
2021-08-26 19:28:44 +00:00
Bo Hu
3107682ab3
Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c am: 5167da569d am: 6cb9946598
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870
Change-Id: I2acaae9b85e09770b7f09cd971f6ee95588f812e
2021-08-26 19:28:37 +00:00
Bo Hu
222f23559e
Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f am: 3c2d039c54
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437
Change-Id: I233c345f6f68211b969a73eee8e68ad53baf7253
2021-08-26 19:05:42 +00:00
Bo Hu
6cb9946598
Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c am: 5167da569d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870
Change-Id: I838c65fd19a23ae72c4380baafe34d6f20a92fd2
2021-08-26 19:05:37 +00:00
Bo Hu
3c2d039c54
Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437
Change-Id: I4d80b2dfb81831ce1176740b2004f3b63d6e5b0a
2021-08-26 18:50:36 +00:00
Bo Hu
5167da569d
Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870
Change-Id: I0cb86918fd5b5eb31ed633cc7dddcea12c125bd4
2021-08-26 18:50:31 +00:00
Bo Hu
95e1a86c7f
Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437
Change-Id: Ie6b4595ffaf9c889f9ce363e08098db15823a2fb
2021-08-26 18:38:42 +00:00
Bo Hu
a7fbe75b82
Merge "Cube 3d live Wallpaper can't be set on android 11"
2021-08-26 17:33:36 +00:00
Bo Hu
b2f5d3e98c
Merge "emulator: disable setting NR as network type" am: 2f2313d01c
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1807202
Change-Id: Ie932a37d5eedc6b3fd9d01777f0f729847bd4742
2021-08-26 17:09:04 +00:00
Bo Hu
2f2313d01c
Merge "emulator: disable setting NR as network type"
2021-08-26 16:53:09 +00:00
Anton Hansson
b6edd7aa51
Add sdk extension version info to prop templates
...
This adds two new properties alongside AndroidVersion.ApiLevel:
- AndroidVersion.ExtensionLevel: The sdk extension version if the SDK
- AndroidVersion.IsBaseSdk: Whether the extension level is the the one
that the ApiLevel shipped with (true), or if is an extension SDK
release (false).
While we're here, dedupe the recipe that processes these templates.
Bug: 195281582
Test: m out/host/linux-x86/development/sdk/platform_source.properties
and inspect the substitution is working
Merged-In: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
2021-08-26 17:11:15 +01:00
Android Build Prod User
b360ac1b4c
[automerger skipped] Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp am: a73a8fe2cf am: 1c2114de42 -s ours
...
am skip reason: Merged-In I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c with SHA-1 fe83c41c1d is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15677289
Change-Id: If5295b3fda7b0f3968cca0628f1233817af91ced
2021-08-26 00:26:31 +00:00
Android Build Prod User
1c2114de42
Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp am: a73a8fe2cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15677289
Change-Id: I5caaee260b962881d788e3705c2e35e5edf4191a
2021-08-26 00:14:43 +00:00
Android Build Prod User
a73a8fe2cf
Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp
2021-08-25 23:56:49 +00:00
Bo Hu
2c536b6eee
Refix "emulator: disable setting NR as network type" am: ba5a679a01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15677291
Change-Id: I22dffa20e70e47366099ac3687e4bf79f5e2202a
2021-08-25 23:42:16 +00:00
Android Build Prod User
665c63607c
[automerger skipped] Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp am: 09f16a3e3f am: bbd2415936 -s ours
...
am skip reason: Merged-In I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c with SHA-1 fe83c41c1d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033
Change-Id: Ib82f6fa044be6ea79a63bb110ab6a6ec0364967b
2021-08-25 22:34:47 +00:00
Bo Hu
573495bdeb
Refix "emulator: disable setting NR as network type"
...
original cl fe4b1d85fa
does not fix the issue
Bug: 193418404
Bug: 197422016
Change-Id: I683b3d3057bcefc14a91ecbbd2e76700cc9c2872
2021-08-25 22:27:47 +00:00
Bo Hu
ba5a679a01
Refix "emulator: disable setting NR as network type"
...
original cl fe4b1d85fa
does not fix the issue
Bug: 193418404
Bug: 197422016
Change-Id: I683b3d3057bcefc14a91ecbbd2e76700cc9c2872
2021-08-25 22:27:34 +00:00
Android Build Prod User
bbd2415936
Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp am: 09f16a3e3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033
Change-Id: If4a6e5ac5db66d0811ac5895bd793f340c7a6001
2021-08-25 22:20:23 +00:00
Android Build Prod User
09f16a3e3f
Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp
2021-08-25 22:08:46 +00:00
Neha Jain
0c38ac56f8
[automerger skipped] <RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5 am: f38a7d0deb am: c2b4eb118d -s ours am: e095b5066a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15670419
Change-Id: Ic582aa94325580055c95d3d02cd36637dea2db14
2021-08-25 06:16:35 +00:00
Neha Jain
66c685a631
[automerger skipped] <RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5 am: f38a7d0deb am: c2b4eb118d am: 651c61cdee -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15670419
Change-Id: I01078ca96caf050c4110aa7a680760a723178e49
2021-08-25 06:16:08 +00:00
Neha Jain
ccfe6a2e3e
[automerger skipped] <RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5 am: f38a7d0deb am: 7f791b0cd8 am: 99e87aea28 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15670419
Change-Id: I98cf34e6bb67d494bf8db8d9b550889b76b6fae7
2021-08-25 06:16:04 +00:00
Neha Jain
e095b5066a
[automerger skipped] <RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5 am: f38a7d0deb am: c2b4eb118d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15670419
Change-Id: Ie83981a7696abfc9bf0e43179fd054274241b0ae
2021-08-25 06:02:40 +00:00
Neha Jain
651c61cdee
<RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5 am: f38a7d0deb am: c2b4eb118d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15670419
Change-Id: Ie6a1e1a61d9b57b2e598c0705b901ac8ba653eac
2021-08-25 06:02:19 +00:00
Neha Jain
99e87aea28
<RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5 am: f38a7d0deb am: 7f791b0cd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15670419
Change-Id: Ic9208f222d9ccdf34cccf73847932809a306f9e8
2021-08-25 06:02:00 +00:00
Neha Jain
c2b4eb118d
<RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5 am: f38a7d0deb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15670419
Change-Id: Ib68ccc9786e91fa5aeb6d79f8e5d9dd2445df4af
2021-08-25 05:41:32 +00:00
Neha Jain
7f791b0cd8
<RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5 am: f38a7d0deb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15670419
Change-Id: I79cc84e1a854ae3d08cb501bf48c794f5c93f70c
2021-08-25 05:40:45 +00:00
Neha Jain
f38a7d0deb
<RESTRICT AUTOMERGE>Update release config and emulator files for Android S(API 31) Beta5
...
Bug: 197685598
Change-Id: I7144208678e4a485b2bf8616b82f5e6da0409247
2021-08-25 04:31:18 +00:00
bohu
fe4b1d85fa
emulator: disable setting NR as network type
...
It appears to be blocking and prevents sdksetup app from
responding.
Disable it for now.
Bug: 193418404
Bug: 197422016
Change-Id: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
Merged-In: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
(cherry picked from commit fe83c41c1d )
2021-08-25 04:23:35 +00:00
bohu
011887d385
emulator: disable setting NR as network type am: fe83c41c1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15669110
Change-Id: Ib5404e0872e75c11da80b59b43fe249841c51e1f
2021-08-25 01:08:40 +00:00
bohu
fe83c41c1d
emulator: disable setting NR as network type
...
It appears to be blocking and prevents sdksetup app from
responding.
Disable it for now.
Bug: 193418404
Bug: 197422016
Change-Id: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
Merged-In: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
2021-08-25 00:12:05 +00:00
bohu
136600a181
emulator: disable setting NR as network type
...
It appears to be blocking and prevents sdksetup app from
responding.
Disable it for now.
Bug: 193418404
Bug: 197422016
Change-Id: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
Merged-In: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
2021-08-24 22:46:16 +00:00
Treehugger Robot
71194cd9f1
Merge changes I47b4756d,I0564369e am: f486885133 am: 39e7a58749 am: a150d58370 am: f3c7c0d3ef
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1804439
Change-Id: Ie324e2ee75dae472ebf0e8b98085718cbf05c8ac
2021-08-23 16:47:01 +00:00
Treehugger Robot
f3c7c0d3ef
Merge changes I47b4756d,I0564369e am: f486885133 am: 39e7a58749 am: a150d58370
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1804439
Change-Id: I18310fbec547adaffd6285e67c21beb2b12476a4
2021-08-23 16:31:08 +00:00
Treehugger Robot
a150d58370
Merge changes I47b4756d,I0564369e am: f486885133 am: 39e7a58749
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1804439
Change-Id: Ie7b51080ffe15b69bbff2f36218ae94988fdb2f4
2021-08-23 16:15:45 +00:00
Treehugger Robot
39e7a58749
Merge changes I47b4756d,I0564369e am: f486885133
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1804439
Change-Id: I73665b6aaf439a8728b35553e6cbd3622d2ef4c6
2021-08-23 15:57:44 +00:00
Treehugger Robot
f486885133
Merge changes I47b4756d,I0564369e
...
* changes:
Let the test mapping updater make commits and upload changes.
Allow passing globs to update_crate_tests.py.
2021-08-23 15:42:49 +00:00
Joel Galenson
4a2a3a8211
Let the test mapping updater make commits and upload changes.
...
This will make it easier to run it on many crates and upload all of
the changes. It puts the uploaded CLs in a topic to save resources.
If the script does not change a TEST_MAPPING, it does not upload
anything.
Test: Run on a subset of crates.
Change-Id: I47b4756d968c54d7d810c8a19a8a7419aebc6e15
2021-08-20 12:26:37 -07:00
Rob Seymour
b6cab552b7
Add host snapshot installation and module checks
...
Bug: 192556798
Bug: 190721104
Test: install host snapshot
Test: check host module usage with fake snapshot
Change-Id: Ib88a66be73041c25af66ec4aa8b42833738cc32c
2021-08-20 18:54:58 +00:00
Joel Galenson
08352445c8
Allow passing globs to update_crate_tests.py.
...
This makes it easier to run it on multiple directories.
Test: Call with various globs.
Change-Id: I0564369e4e8b9d62482fb2162a16d0e588f94e57
2021-08-20 11:39:48 -07:00
Treehugger Robot
d2d3c0d4d9
Merge "Add support for reuse configuration in OTA generator." am: 097e8c0a15 am: 4976675e9a am: 023d8bfa44 am: 461112ec85
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1802616
Change-Id: I5170fb8ea6a2a5d223aff85212e13098f7bbc0d6
2021-08-19 21:51:15 +00:00
Treehugger Robot
461112ec85
Merge "Add support for reuse configuration in OTA generator." am: 097e8c0a15 am: 4976675e9a am: 023d8bfa44
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1802616
Change-Id: I1020f5807de22c5f5dad72e4633f7c4d0360160f
2021-08-19 21:32:54 +00:00
Treehugger Robot
023d8bfa44
Merge "Add support for reuse configuration in OTA generator." am: 097e8c0a15 am: 4976675e9a
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1802616
Change-Id: Id720629612f67560e57ddc0d787ee6314dbbf999
2021-08-19 21:15:29 +00:00
Treehugger Robot
4976675e9a
Merge "Add support for reuse configuration in OTA generator." am: 097e8c0a15
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1802616
Change-Id: Idb3bc4cbff66d8bd9c410cf5225bb9c1f7dac04a
2021-08-19 21:01:12 +00:00
Treehugger Robot
097e8c0a15
Merge "Add support for reuse configuration in OTA generator."
2021-08-19 20:45:53 +00:00
Treehugger Robot
59ee286b44
Merge "Fix a bug that may cause the ota generation fail." am: 54f24641bc am: e3d4db13a7 am: cd0f8452be am: 74f0d027a6
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1801907
Change-Id: I6c06e0da2ec2d2a0536dd3698171dcd10b343eed
2021-08-19 17:34:26 +00:00
Treehugger Robot
74f0d027a6
Merge "Fix a bug that may cause the ota generation fail." am: 54f24641bc am: e3d4db13a7 am: cd0f8452be
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1801907
Change-Id: Ic2c060f9fc579bed3fb4d332ed436a6718cae30d
2021-08-19 17:18:59 +00:00
Treehugger Robot
cd0f8452be
Merge "Fix a bug that may cause the ota generation fail." am: 54f24641bc am: e3d4db13a7
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1801907
Change-Id: I40e960906f9bfc241c479fd3c2121c6845364e55
2021-08-19 17:01:09 +00:00
Treehugger Robot
e3d4db13a7
Merge "Fix a bug that may cause the ota generation fail." am: 54f24641bc
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1801907
Change-Id: I9f74bd1fd9422116d4fe6726b4d34585c5f84cdf
2021-08-19 16:51:53 +00:00