LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,837 Commits 2 Branches 0 Tags
21a8382038c20049399d60ccd0cb1519d3d97642
Commit Graph

31837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelvin Zhang
8a287efeea Merge "Cancel polling task after component unmount" am: 3862d22d0e am: b1da09b852 
Original change: https://android-review.googlesource.com/c/platform/development/+/1815616

Change-Id: If420d4df57710175c396ccaed8495d5a815a95b1
 2021-09-01 14:49:28 +00:00
Kelvin Zhang
5a581bdeb3 Merge "Remove noop try catch statements" am: 401c6d5d23 am: 5e1f196247 
Original change: https://android-review.googlesource.com/c/platform/development/+/1815095

Change-Id: Ia400ac7117bef190aef6538a01666142c5157b67
 2021-09-01 14:49:22 +00:00
Kelvin Zhang
8834603a01 Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b 
Original change: https://android-review.googlesource.com/c/platform/development/+/1815621

Change-Id: I18cc97ec071980725514785aafdd7927821410b8
 2021-09-01 14:34:23 +00:00
Kelvin Zhang
b1da09b852 Merge "Cancel polling task after component unmount" am: 3862d22d0e 
Original change: https://android-review.googlesource.com/c/platform/development/+/1815616

Change-Id: If897bc469c04123262e67807e05f74fdc5a50ac0
 2021-09-01 14:34:12 +00:00
Kelvin Zhang
5e1f196247 Merge "Remove noop try catch statements" am: 401c6d5d23 
Original change: https://android-review.googlesource.com/c/platform/development/+/1815095

Change-Id: I6c5c988fb833d75cf03359267db6bbce049319fa
 2021-09-01 14:34:06 +00:00
Kelvin Zhang
e6ae7c629b Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c 
* changes:
  API Service should return json data directly
  Rename path to db_path
  Ignore vscode files in docker
  Return error in json
  Delegate choice of output file path to 1 place in code
 2021-09-01 14:21:26 +00:00
Kelvin Zhang
3862d22d0e Merge "Cancel polling task after component unmount" 2021-09-01 14:21:09 +00:00
Kelvin Zhang
401c6d5d23 Merge "Remove noop try catch statements" 2021-09-01 14:20:57 +00:00
Anton Hansson
05ec1029b9 [automerger skipped] Merge "Add sdk extension version info to prop templates" am: cf4b9a604d -s ours am: 7c0923a2be -s ours am: 0df6fdedce -s ours am: 35a8ef22a4 -s ours 
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 48c492ed9f is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1810658

Change-Id: I258ba4de6164edde512f6151a2fefdce16001ac7
 2021-09-01 09:58:00 +00:00
Anton Hansson
35a8ef22a4 [automerger skipped] Merge "Add sdk extension version info to prop templates" am: cf4b9a604d -s ours am: 7c0923a2be -s ours am: 0df6fdedce -s ours 
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 48c492ed9f is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1810658

Change-Id: I6834a26302417a2545b9d76e8b37b78d0797753b
 2021-09-01 09:45:47 +00:00
Anton Hansson
0df6fdedce [automerger skipped] Merge "Add sdk extension version info to prop templates" am: cf4b9a604d -s ours am: 7c0923a2be -s ours 
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 48c492ed9f is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1810658

Change-Id: I98bed3db29380c7b34cd0aa106f85be1f181af2e
 2021-09-01 09:32:12 +00:00
Anton Hansson
7c0923a2be [automerger skipped] Merge "Add sdk extension version info to prop templates" am: cf4b9a604d -s ours 
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 48c492ed9f is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1810658

Change-Id: I67e0c653f2ae5bfc8f37345461b497ea8e0ec163
 2021-09-01 09:19:54 +00:00
Anton Hansson
a547584ce2 [automerger skipped] Merge "Add sdk extension version info to prop templates" into stage-aosp-master am: 674c51fa21 -s ours am: 295fc250b6 -s ours am: af49de1dc5 -s ours 
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 786bf26e3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15727746

Change-Id: I25100154c33ef0b58dc5ed8ce4494412c13d4ba8
 2021-09-01 09:00:36 +00:00
Anton Hansson
cf4b9a604d Merge "Add sdk extension version info to prop templates" 2021-09-01 09:00:15 +00:00
Anton Hansson
af49de1dc5 [automerger skipped] Merge "Add sdk extension version info to prop templates" into stage-aosp-master am: 674c51fa21 -s ours am: 295fc250b6 -s ours 
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 786bf26e3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15727746

Change-Id: I490e85a072b81fb80be55e5217633ce4f418f95c
 2021-09-01 08:45:58 +00:00
Anton Hansson
295fc250b6 [automerger skipped] Merge "Add sdk extension version info to prop templates" into stage-aosp-master am: 674c51fa21 -s ours 
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 786bf26e3a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15727746

Change-Id: I13b4de40db92f05c29c571d6548815de96c1dfa7
 2021-09-01 08:34:30 +00:00
Anton Hansson
674c51fa21 Merge "Add sdk extension version info to prop templates" into stage-aosp-master 2021-09-01 08:21:32 +00:00
Kelvin Zhang
6e0c8c6c37 API Service should return json data directly 
Change-Id: Ic5fdefe23443733c3c7e0ae8f351c39117326794
 2021-08-31 20:06:57 -07:00
Kelvin Zhang
6186351117 Merge "Skip non-zip files when refreshing build library" am: 2d4909a1cb am: 985259187a am: 0a3522a60e am: adb23121fd 
Original change: https://android-review.googlesource.com/c/platform/development/+/1811897

Change-Id: Ibc3b79aca659deed86b6d4db1645a84fbc5df324
 2021-09-01 01:22:18 +00:00
Kelvin Zhang
adb23121fd Merge "Skip non-zip files when refreshing build library" am: 2d4909a1cb am: 985259187a am: 0a3522a60e 
Original change: https://android-review.googlesource.com/c/platform/development/+/1811897

Change-Id: I5445301adc369157eb3f5f614c8b4420ae2febfa
 2021-09-01 01:06:23 +00:00
Kelvin Zhang
0a3522a60e Merge "Skip non-zip files when refreshing build library" am: 2d4909a1cb am: 985259187a 
Original change: https://android-review.googlesource.com/c/platform/development/+/1811897

Change-Id: Ifc18b666217aed1db904ec8e7b89b25ef8e01476
 2021-09-01 00:50:31 +00:00
Kelvin Zhang
985259187a Merge "Skip non-zip files when refreshing build library" am: 2d4909a1cb 
Original change: https://android-review.googlesource.com/c/platform/development/+/1811897

Change-Id: I376dbf4d7cf672a7d64419b6cfae634b5b66c91e
 2021-09-01 00:37:19 +00:00
Kelvin Zhang
fd50cb8be1 Rename path to db_path 
Change-Id: I32cbd02722a81b54f55df092bc762463df939a9d
 2021-08-31 17:28:43 -07:00
Kelvin Zhang
d7ebc10c0d Cancel polling task after component unmount 
Test: th
Change-Id: I0d9058bd24236ea1e22bf91f98b2dbadc83cf8d3
 2021-08-31 17:28:42 -07:00
Kelvin Zhang
694daa581f Remove noop try catch statements 
Test: th
Change-Id: I5c6fcd5cdd602207e3befc3ff92137d39968c546
 2021-08-31 17:28:42 -07:00
Kelvin Zhang
fd33874a47 Ignore vscode files in docker 
Change-Id: I464d846c86a6c98c4be2e1993014a799ffc5d7b1
 2021-08-31 17:28:42 -07:00
Kelvin Zhang
9b854aa4bf Return error in json 
Test: th
Change-Id: Ie9ef8e2bac6447bdc1bf40dcb2b5731b57b47f77
 2021-08-31 17:28:42 -07:00
Kelvin Zhang
2ea0bfceb0 Delegate choice of output file path to 1 place in code 
Test: th
Change-Id: Ib7b02d5ce4335594b6ca625d850e7176dbdb4f8e
 2021-08-31 17:28:42 -07:00
Kelvin Zhang
2d4909a1cb Merge "Skip non-zip files when refreshing build library" 2021-09-01 00:23:38 +00:00
Joel Galenson
b06c42a03c Generate cargo_pkg_version and cargo_env_compat for defaults. 
The existing code only adds it to things without defaults.  This adds
it to the defaults module itself, which should not overlap the
existing code.

Test: Run and see new entries.
Change-Id: Iaf3d0b47193bb1f54cdc605c88c2cd68034d963a
 2021-08-31 14:28:48 -07:00
Anton Hansson
48c492ed9f 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
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
Merged-In: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
(cherry picked from commit cf2f42c36b7997e9ce87682bb3a5511bdb72936f)
 2021-08-31 17:42:12 +00:00
Nataniel Borges
325b0476f5 [DO NOT MERGE] Sync flicker from master to sc-v2 
Flicker on master diverged form sc-v2, to make it easier to debug
flicker issues on sc-v2, push the current version of flicker into sc-v2

Test: atest FlickerTests WMShellFlickerTests
Bug: 188792659
Change-Id: Iaacfaa75102f93351a6ccd0252ecd739784f94ff
 2021-08-31 15:08:53 +00:00
Anton Hansson
f9355bc2cc Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp am: 538c18b677 am: 310344483f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684826

Change-Id: I3ab61a92dff6b16de8b462b0c530ac198465979f
 2021-08-31 11:10:51 +00:00
Anton Hansson
310344483f Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp am: 538c18b677 
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684826

Change-Id: I0fe4d2483adf6151a9ad65daa90f56aeb7149b38
 2021-08-31 10:59:03 +00:00
Anton Hansson
538c18b677 Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp 2021-08-31 10:15:34 +00:00
Joel Galenson
a2cee68264 Merge "Let the test mapping updater handle newly-added files." am: 23d41df362 am: 194b0f6ef7 am: 83135cb01e am: 85c4380dd6 
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: Ife47ba3e780e4cd453e0123eca8ca14c7eb0ef84
 2021-08-30 20:47:46 +00:00
Joel Galenson
85c4380dd6 Merge "Let the test mapping updater handle newly-added files." am: 23d41df362 am: 194b0f6ef7 am: 83135cb01e 
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: Ia13d971cd09d5c06e88bd50a75c820b8b236d0d5
 2021-08-30 20:39:32 +00:00
Joel Galenson
83135cb01e Merge "Let the test mapping updater handle newly-added files." am: 23d41df362 am: 194b0f6ef7 
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: Iac96a37a02c7e9322cf994427bbd5488b9e3d19f
 2021-08-30 20:22:06 +00:00
Joel Galenson
194b0f6ef7 Merge "Let the test mapping updater handle newly-added files." am: 23d41df362 
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: I1024a0460df86b09a5565fccea03a22e20d9a28b
 2021-08-30 20:06:49 +00:00
Treehugger Robot
b5f586140c Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb am: cb2bd4fb80 am: 2399efab64 am: 6ead11dd5a 
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I01ca0ed04190051a156bad7e4e9ab5f3c0416dcb
 2021-08-30 19:48:38 +00:00
Joel Galenson
23d41df362 Merge "Let the test mapping updater handle newly-added files." 2021-08-30 19:47:01 +00:00
Treehugger Robot
6ead11dd5a Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb am: cb2bd4fb80 am: 2399efab64 
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I21712400cc9692276cd4e436a78cf1cc2713b01c
 2021-08-30 19:31:41 +00:00
Treehugger Robot
2399efab64 Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb am: cb2bd4fb80 
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I199d7223c6bf72c46a9ed09b507f71c4280b4d30
 2021-08-30 19:08:10 +00:00
Treehugger Robot
cb2bd4fb80 Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb 
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I1fb1e796e10ed5b31a210375c1707721735fa856
 2021-08-30 18:33:13 +00:00
Treehugger Robot
f1a77506eb Merge "Stop hardcoding a keypath in OTA generator" 2021-08-30 18:12:38 +00:00
Joel Galenson
bdf3ab4d8e Let the test mapping updater handle newly-added files. 
The previous commit to this file allowed it to create and upload a
commit when a TEST_MAPPING file changed.  But it did not handle the
case where the TEST_MAPPING file did not previously exist.  This fixes
that.

Test: Run script.
Change-Id: Id7b9e778c2b084f7ea2e4005a173c1fedeccd6c7
 2021-08-30 08:59:47 -07:00
Kelvin Zhang
4993e35acf Skip non-zip files when refreshing build library 
Test: th
Change-Id: I16631183c40136c4603f20e2ea07664123338da4
 2021-08-27 10:53:50 -07:00
Kelvin Zhang
157e46b183 Stop hardcoding a keypath in OTA generator 
Test: th
Change-Id: I6f55a36e4559d635bd6cf24fa0b4891ccd2ab9f8
 2021-08-27 10:53:23 -07:00
Anton Hansson
786bf26e3a 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
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
(cherry picked from commit cf2f42c36b7997e9ce87682bb3a5511bdb72936f)
 2021-08-27 17:41:03 +01:00
Aurimas Liutikas
bf2928fdc9 Convert DumpViewer to Android.bp 
Test: make DumpViewer
Change-Id: I0f2fe63a3742888978cebd5bb9947d37291c5545
Merged-In: I0f2fe63a3742888978cebd5bb9947d37291c5545
(cherry picked from commit 57eeb31650)
 2021-08-26 12:37:53 -07:00