Commit Graph

30391 Commits

Author SHA1 Message Date
Treehugger Robot
c6a3e052d5 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769 am: 4d108c6ffe am: 483ddf28c8 am: 73272bf578
Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf213e3192a41b538ccbf74f34dc80faa517c0d2
2021-02-16 01:35:40 +00:00
Treehugger Robot
73272bf578 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769 am: 4d108c6ffe am: 483ddf28c8
Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bfb99db5af219de8b7c6844b99006009152bbe8
2021-02-16 01:02:14 +00:00
Treehugger Robot
483ddf28c8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769 am: 4d108c6ffe
Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7afca5e0c8e8e374cab9512eb208120465f8bcc
2021-02-16 00:31:47 +00:00
Treehugger Robot
4d108c6ffe Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769
Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d125bf7c5ef4dfb8294fcfe1fec3d2719b6acb
2021-02-15 23:48:17 +00:00
Treehugger Robot
d6b1cbf769 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" 2021-02-15 23:21:47 +00:00
Hongming Jin
71bd984858 Allow capturing accessibility trace through adb connected device.
Bug: 157601519
Test: Manual test using local windscope
Change-Id: I776d38dfc22ac4577b568e1d9a67c71ce132df7d
2021-02-15 05:13:20 +00:00
Bob Badour
f7cf305656 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/BluetoothDebug/Android.bp
  apps/BuildWidget/Android.bp
  apps/CustomLocale/Android.bp
  apps/DevelopmentSettings/Android.bp
  apps/Fallback/Android.bp
  apps/GestureBuilder/Android.bp
  apps/NinePatchLab/Android.bp
  apps/OBJViewer/Android.bp
  apps/PushApiAuthenticator/Android.bp
  apps/PushApiTestAppOne/Android.bp
  apps/PushApiTestAppTwo/Android.bp
  apps/SdkSetup/Android.bp
  apps/SettingInjectorSample/Android.bp
  apps/WidgetPreview/Android.bp
  apps/launchperf/Android.bp
  cmds/monkey/Android.mk
  gsi/gsi_util/Android.bp
  gsi/repack_super_image/Android.bp
  host/windows/Android.bp
  python-packages/Android.bp
  samples/AccelerometerPlay/Android.bp
  samples/AdaptiveIconSample/Android.bp
  samples/AliasActivity/Android.bp
  samples/AndroidBeamDemo/Android.bp
  samples/AppNavigation/Android.bp
  samples/AutofillKeyboard/Android.bp
  samples/BackupRestore/Android.bp
  samples/BasicGLSurfaceView/Android.bp
  samples/BluetoothChat/Android.bp
  samples/BrokenKeyDerivation/Android.bp
  samples/BrokenKeyDerivation/tests/Android.bp
  samples/BusinessCard/Android.bp
  samples/Compass/Android.bp
  samples/ContactManager/Android.bp
  samples/CubeLiveWallpaper/Android.bp
  samples/DataWiper/Android.bp
  samples/DeviceAdminWhitelistedAccount/Android.bp
  samples/FixedGridLayout/Android.bp
  samples/HeavyWeight/Android.bp
  samples/HelloActivity/Android.bp
  samples/HelloActivity/tests/Android.bp
  samples/HelloEffects/Android.bp
  samples/Home/Android.bp
  samples/HoneycombGallery/Android.bp
  samples/InlineFillService/Android.bp
  samples/JetBoy/Android.bp
  samples/LceDemo/Android.bp
  samples/LunarLander/Android.bp
  samples/LunarLander/tests/Android.bp
  samples/MultiResolution/Android.bp
  samples/MultiWindow/Android.bp
  samples/MySampleRss/Android.bp
  samples/NotePad/Android.bp
  samples/Obb/Android.bp
  samples/RSSReader/Android.bp
  samples/ReceiveShareDemo/Android.bp
  samples/SampleSyncAdapter/Android.bp
  samples/SimpleJNI/Android.bp
  samples/SimpleJNI/jni/Android.bp
  samples/SipDemo/Android.bp
  samples/SkeletonApp/Android.bp
  samples/SkeletonApp/tests/Android.bp
  samples/Snake/Android.bp
  samples/Snake/tests/Android.bp
  samples/SoftKeyboard/Android.bp
  samples/SpellChecker/HelloSpellChecker/Android.bp
  samples/SpellChecker/SampleSpellCheckerService/Android.bp
  samples/StackWidget/Android.bp
  samples/ThemedNavBarKeyboard/Android.bp
  samples/ToyVpn/Android.bp
  samples/TtsEngine/Android.bp
  samples/USB/AdbTest/Android.bp
  samples/USB/MissileLauncher/Android.bp
  samples/UiAutomator/Android.mk
  samples/Vault/Android.bp
  samples/Vault/tests/Android.bp
  samples/VoiceRecognitionService/Android.bp
  samples/VoicemailProviderDemo/Android.bp
  samples/WeatherListWidget/Android.bp
  samples/WiFiDirectDemo/Android.bp
  samples/WiFiDirectServiceDiscovery/Android.bp
  samples/Wiktionary/Android.bp
  samples/WiktionarySimple/Android.bp
  samples/XmlAdapters/Android.bp
  samples/apkcachetest/Android.bp
  samples/training/NsdChat/Android.bp
  scripts/Android.bp
  testrunner/Android.mk
  testrunner/tests/Android_native.mk
  tools/apkcheck/Android.bp
  tools/bugreport/Android.bp
  tools/etc1tool/Android.bp
  tools/idegen/Android.bp
  tools/mkstubs/Android.bp
  tools/rmtypedefs/Android.bp
  vndk/Android.bp
  vndk/tools/Android.bp
  vndk/tools/elfcheck/Android.bp
  vndk/tools/header-checker/Android.bp
  vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp
  vndk/tools/header-checker/tests/integration/ifunc/Android.bp
  vndk/tools/header-checker/tests/integration/version_script_example/Android.bp
  vndk/tools/image-diff-tool/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-W3C
    legacy_restricted legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
  samples/SearchableDictionary/Android.bp

Added SPDX-license-identifier-Apache-2.0 legacy_unencumbered
to:
  tools/Android.bp

Added SPDX-license-identifier-BSD SPDX-license-identifier-CPL-1.0
    SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
    SPDX-license-identifier-W3C
to:
  sdk/Android.bp

Added legacy_restricted
to:
  samples/KeyChainDemo/Android.bp
  tools/line_endings/Android.bp
  vndk/tools/definition-tool/datasets/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9847e00fb4278bc083b4debbc751003c995ea45c
2021-02-12 17:13:45 -08:00
Hongwei Wang
46283221cb Merge "Add demo for autoEnterPip w/o sourceRectHint" into sc-dev am: b4663fc4f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13524838

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide2ee1f3555d4e6718cc55800def9f6307e07685
2021-02-10 20:37:08 +00:00
Hongwei Wang
b4663fc4f7 Merge "Add demo for autoEnterPip w/o sourceRectHint" into sc-dev 2021-02-10 20:03:07 +00:00
Jose "Pepe" Galmes
8f4bdefea1 Merge "Implement directed recovery snapshot." am: b44c5b747c am: d2f9cd048d am: ebc06e7ad6 am: ae27f0b3f0
Original change: https://android-review.googlesource.com/c/platform/development/+/1579217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I684d57982fb98488ae80cf8e069fe48994f160a6
2021-02-10 02:08:43 +00:00
Jose "Pepe" Galmes
ae27f0b3f0 Merge "Implement directed recovery snapshot." am: b44c5b747c am: d2f9cd048d am: ebc06e7ad6
Original change: https://android-review.googlesource.com/c/platform/development/+/1579217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03e772a76e772a804069c61ef5269b8d20bbf0e6
2021-02-10 01:45:57 +00:00
Jose "Pepe" Galmes
ebc06e7ad6 Merge "Implement directed recovery snapshot." am: b44c5b747c am: d2f9cd048d
Original change: https://android-review.googlesource.com/c/platform/development/+/1579217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ac81beb89c732c38b1c68ddd9d7b281be9fcba6
2021-02-10 01:21:47 +00:00
Jose "Pepe" Galmes
d2f9cd048d Merge "Implement directed recovery snapshot." am: b44c5b747c
Original change: https://android-review.googlesource.com/c/platform/development/+/1579217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ed083cd79836725f69ad43d2f2e0513ca07034f
2021-02-10 00:28:34 +00:00
Jose "Pepe" Galmes
b44c5b747c Merge "Implement directed recovery snapshot." 2021-02-10 00:02:34 +00:00
Jose Galmes
8070a1ad1e Implement directed recovery snapshot.
Bug: 177451657
Test: m -j nothing
Change-Id: I72a37ddde78951e61106cc532921ca47eed71922
2021-02-09 09:55:58 -08:00
Hongwei Wang
35faf69308 Add demo for autoEnterPip w/o sourceRectHint
Video: http://rcll/aaaaaabFQoRHlzixHdtY/cdY8k6V9uhJEXyMAKAUA34
Video: http://rcll/aaaaaabFQoRHlzixHdtY/bvodLNGyrIXH8DSvGHehrp
Bug: 179286893
Test: manual in ApiDemos app, see video
Change-Id: Ib1ae64e24c901d2a921b0b5d40bffb196f8121ba
2021-02-08 16:51:58 -08:00
Treehugger Robot
b0a0e48a16 [automerger skipped] Merge "Switch to the kernel from kernel/prebuilts" am: acffc6c796 am: f58e0181ba am: b108c60c9c -s ours am: fe70e40746 -s ours
am skip reason: Change-Id Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82 with SHA-1 67338b9eb5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19b0c0bbae5d5e05378b104b6c49cc90d0a1deda
2021-02-05 19:26:54 +00:00
Treehugger Robot
fe70e40746 [automerger skipped] Merge "Switch to the kernel from kernel/prebuilts" am: acffc6c796 am: f58e0181ba am: b108c60c9c -s ours
am skip reason: Change-Id Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82 with SHA-1 67338b9eb5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d4db5d0a38312a81f27f6cbfb2526c7c5dec8f9
2021-02-05 19:01:34 +00:00
Treehugger Robot
b108c60c9c Merge "Switch to the kernel from kernel/prebuilts" am: acffc6c796 am: f58e0181ba
Original change: https://android-review.googlesource.com/c/platform/development/+/1576367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I068da56c1b4cac62da114010e69db2f66f108030
2021-02-05 18:28:36 +00:00
Treehugger Robot
f58e0181ba Merge "Switch to the kernel from kernel/prebuilts" am: acffc6c796
Original change: https://android-review.googlesource.com/c/platform/development/+/1576367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I601c18dace2fb4a55b277d704864a0e15b68035a
2021-02-05 17:50:06 +00:00
Treehugger Robot
acffc6c796 Merge "Switch to the kernel from kernel/prebuilts" 2021-02-05 17:21:17 +00:00
TreeHugger Robot
1a50ba43c1 Merge "Make winscope compatible with flickerlib constructors" into sc-dev am: 471c1da8dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13434216

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ee56c7a0c30ffdb662ccfb2c07e71e4d0851e03
2021-02-05 14:57:17 +00:00
TreeHugger Robot
471c1da8dc Merge "Make winscope compatible with flickerlib constructors" into sc-dev 2021-02-05 14:39:17 +00:00
Nataniel Borges
dc836bc679 Make winscope compatible with flickerlib constructors
Recently the constructors of the flickerlib objects were
updated to reduce memory.

This CL updates winscope parser objects and fix visualization
so that it is compatible with those changes

Bug: 178572522
Test: `yarn run dev` and open a window manager trace
Change-Id: Ic331fe90d17e5c30c9062f119e26e824dbe1e5a7
2021-02-05 13:59:03 +01:00
Roman Kiryanov
cc09ceecde Switch to the kernel from kernel/prebuilts
prebuilts/qemu-kernel is deprecated.

Bug: 170677468
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
Merged-In: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
2021-02-04 14:20:28 -08:00
TreeHugger Robot
61bed57ec3 Merge "Switch to the kernel from kernel/prebuilts" into sc-dev am: 651d6dca49
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13476701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3c3178557087f956f68770e8f1597e829546cde
2021-02-04 20:04:54 +00:00
TreeHugger Robot
651d6dca49 Merge "Switch to the kernel from kernel/prebuilts" into sc-dev 2021-02-04 19:40:52 +00:00
Treehugger Robot
21c045922e Merge "update_crate_tests.py: don't use sys.exit()" am: 45b7b32f7e am: e90305e34d am: be1cce0a4f am: 5c44b32012
Original change: https://android-review.googlesource.com/c/platform/development/+/1573245

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab48dd6178cdd00672ca26b30fd337ba06fb5ac9
2021-02-04 15:01:16 +00:00
Treehugger Robot
5c44b32012 Merge "update_crate_tests.py: don't use sys.exit()" am: 45b7b32f7e am: e90305e34d am: be1cce0a4f
Original change: https://android-review.googlesource.com/c/platform/development/+/1573245

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddec8f8ad5e4bdd600deb470818ae1161076e06b
2021-02-04 14:45:11 +00:00
Treehugger Robot
be1cce0a4f Merge "update_crate_tests.py: don't use sys.exit()" am: 45b7b32f7e am: e90305e34d
Original change: https://android-review.googlesource.com/c/platform/development/+/1573245

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I701bf0197c59c35dcf85429ecf40bd722ef3267e
2021-02-04 14:24:15 +00:00
Treehugger Robot
e90305e34d Merge "update_crate_tests.py: don't use sys.exit()" am: 45b7b32f7e
Original change: https://android-review.googlesource.com/c/platform/development/+/1573245

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c8074d6cc278aa30970813d1be80950f0150c75
2021-02-04 13:22:57 +00:00
Treehugger Robot
45b7b32f7e Merge "update_crate_tests.py: don't use sys.exit()" 2021-02-04 12:59:40 +00:00
Treehugger Robot
63d54d8f37 Merge "update_crate_tests: fail gracefully" am: f9d75c1f5a am: 216c726555 am: 99fa553315 am: 2b8696c0c7
Original change: https://android-review.googlesource.com/c/platform/development/+/1573140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b2b21c819c0e3e791f5ff6309b2eb7dce115b31
2021-02-04 11:35:37 +00:00
Treehugger Robot
2b8696c0c7 Merge "update_crate_tests: fail gracefully" am: f9d75c1f5a am: 216c726555 am: 99fa553315
Original change: https://android-review.googlesource.com/c/platform/development/+/1573140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If65188e87183f7987c6ce620b09f147f0dcdc470
2021-02-04 11:20:09 +00:00
Jeff Vander Stoep
82ee11ae77 update_crate_tests.py: don't use sys.exit()
If the TEST_MAPPING cannot be generated, print the reason, but
exit without error. It's not uncommon for the output of cargo2android
to fail to build e.g. if a new depencency is not satisfied, so we can
fall back to the previous TEST_MAPPING, or run update_crate_tests
locally once all dependencies are present.

Bug: 179132533
Test: tools/external_updater/updater.sh update rust/crates/textwrap
Test: tools/external_updater/updater.sh update rust/crates/libc
Change-Id: I4802c77332d1ab1d6604d48c47365f40bdbd1122
2021-02-04 12:10:39 +01:00
Treehugger Robot
99fa553315 Merge "update_crate_tests: fail gracefully" am: f9d75c1f5a am: 216c726555
Original change: https://android-review.googlesource.com/c/platform/development/+/1573140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15a1844c458ad3e335bc575e6aa88a53d0b9236f
2021-02-04 10:10:58 +00:00
Treehugger Robot
216c726555 Merge "update_crate_tests: fail gracefully" am: f9d75c1f5a
Original change: https://android-review.googlesource.com/c/platform/development/+/1573140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01771f97352786d13a3abb3a0c8ce53b91d49178
2021-02-04 09:48:08 +00:00
Treehugger Robot
f9d75c1f5a Merge "update_crate_tests: fail gracefully" 2021-02-04 08:39:22 +00:00
Roman Kiryanov
67338b9eb5 Switch to the kernel from kernel/prebuilts
prebuilts/qemu-kernel is deprecated.

Bug: 170677468
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
2021-02-03 17:27:50 -08:00
Jeff Vander Stoep
1b24dc3f71 update_crate_tests: fail gracefully
Allow this script to accept a path to the crate being updated.
This allows it to be run separately from cargo2android.

Also, fail gracefully on error. TEST_MAPPING update failures should
not block crate updates.

Test: tools/external_updater/updater.sh update rust/crates/libc
Bug: 179132533
Change-Id: I3a4229f479ab3d2793df16b470f0a0632b9ee495
2021-02-03 21:42:40 +01:00
Galia Peycheva
1e394013dc Merge "Revert "Remove public usages of FLAG_BLUR_BEHIND"" into sc-dev am: 6160e125d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13435115

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacc71e18cd585843cfdac8e5dee60bda777be9a5
2021-02-03 06:10:19 +00:00
Galia Peycheva
6160e125d4 Merge "Revert "Remove public usages of FLAG_BLUR_BEHIND"" into sc-dev 2021-02-03 05:49:40 +00:00
Jorge Gil
6f8702ab1e Merge "Add Api Demo for PiP source rect hint" into sc-dev am: 467da48c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13428071

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifeac37099206c7553699208f638a88e6f5e3b821
2021-02-02 20:15:57 +00:00
Jorge Gil
467da48c11 Merge "Add Api Demo for PiP source rect hint" into sc-dev 2021-02-02 19:34:14 +00:00
Weilun Du
3154354b46 Merge "Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout" am: 9924173829 am: 46681fc0d8 am: 181aa286df am: 80002baf13
Original change: https://android-review.googlesource.com/c/platform/development/+/1561419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1963f84ea66cad234a6c93e83383e7026649c89
2021-02-02 02:54:19 +00:00
Inseob Kim
56e4ff6313 Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: b968be1e69 am: cffc2fa0a2 am: 4f8ed9f2dd am: a6d90b9556
Original change: https://android-review.googlesource.com/c/platform/development/+/1563533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42acf71e78b85299bbe57c8b1552e7b975c4c92e
2021-02-02 02:53:49 +00:00
Weilun Du
80002baf13 Merge "Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout" am: 9924173829 am: 46681fc0d8 am: 181aa286df
Original change: https://android-review.googlesource.com/c/platform/development/+/1561419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd06180eac65249dac6b8b2d8f8e570bb858dc32
2021-02-02 01:55:55 +00:00
Inseob Kim
a6d90b9556 Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: b968be1e69 am: cffc2fa0a2 am: 4f8ed9f2dd
Original change: https://android-review.googlesource.com/c/platform/development/+/1563533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I983b329d5395bd103392f0c368d0d6f962a47cf3
2021-02-02 01:55:21 +00:00
Weilun Du
181aa286df Merge "Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout" am: 9924173829 am: 46681fc0d8
Original change: https://android-review.googlesource.com/c/platform/development/+/1561419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia40a0fdfd2a5d96a43850c6f12e7e1f5edbb7566
2021-02-02 01:24:00 +00:00
Inseob Kim
4f8ed9f2dd Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: b968be1e69 am: cffc2fa0a2
Original change: https://android-review.googlesource.com/c/platform/development/+/1563533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8b1c21984f4f42827b21be7c8c29ba8df616f56
2021-02-02 01:23:52 +00:00