Commit Graph

565533 Commits

Author SHA1 Message Date
Benedict Wong
009a6d90aa Merge "Implement ChildSessionCallback#onIpSecTransformsMigrated" am: d301c8544e am: 3cb4449683
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589136

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49abe822e901e195dafaf66808f1e36681f9c3aa
2021-02-17 05:10:57 +00:00
Benedict Wong
3cb4449683 Merge "Implement ChildSessionCallback#onIpSecTransformsMigrated" am: d301c8544e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589136

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99674437f842f38a60eda80ecbc45b8bd42fa661
2021-02-17 04:26:50 +00:00
Benedict Wong
d301c8544e Merge "Implement ChildSessionCallback#onIpSecTransformsMigrated" 2021-02-17 04:02:40 +00:00
Treehugger Robot
d3e76abc07 Merge "Hide keyguard when SIM transitions to READY" am: 0ae1b444ca am: a6a39e5e29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55fc9cac27c38b41cc815f8a0e74e124c89bfe07
2021-02-17 03:52:28 +00:00
Treehugger Robot
a6a39e5e29 Merge "Hide keyguard when SIM transitions to READY" am: 0ae1b444ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I112188b6f78a650a551ebaed4a44e7d57c4ba892
2021-02-17 03:12:04 +00:00
Treehugger Robot
0ae1b444ca Merge "Hide keyguard when SIM transitions to READY" 2021-02-17 02:55:34 +00:00
Lorenzo Colitti
7eac1eedbc Merge "Use UserHandles instead of userId integers." am: 2531219560 am: a2831e1346
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5652b8847b094ef009d3ace14948e9122339ed21
2021-02-17 02:20:49 +00:00
Lorenzo Colitti
a2831e1346 Merge "Use UserHandles instead of userId integers." am: 2531219560
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If674b972d4cf28094fc21c37197ec96e94ecdbcb
2021-02-17 01:51:14 +00:00
Michele Berionne
36e6f471a2 Hide keyguard when SIM transitions to READY
The keyguard is not properly updated when the SIM PIN verification is
performed using different means than the UI. Additional states are used
before READY, so simWasLocked might be false.

Bug: 160784387
Test: manual
Change-Id: Ibca04e3d6a61c27d4b40f94a8a6223d9739b15ac
Merged-In: Ibca04e3d6a61c27d4b40f94a8a6223d9739b15ac
(cherry picked from commit d12075a949)
2021-02-17 01:41:40 +00:00
Lorenzo Colitti
2531219560 Merge "Use UserHandles instead of userId integers." 2021-02-17 01:26:44 +00:00
Cody Kesting
8c576fb131 Merge "Implement Safemode alarm in VcnGatewayConnection." am: 30d9bfa03b am: 875a7d0764
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23bd4a0d08f9a214280e6753453d98f7f07652aa
2021-02-16 23:35:08 +00:00
Cody Kesting
875a7d0764 Merge "Implement Safemode alarm in VcnGatewayConnection." am: 30d9bfa03b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id69a7f216631061a0fbb85d694ab7d92091830a9
2021-02-16 22:57:15 +00:00
Cody Kesting
30d9bfa03b Merge "Implement Safemode alarm in VcnGatewayConnection." 2021-02-16 22:29:21 +00:00
Benedict Wong
d6186bdf3c Implement ChildSessionCallback#onIpSecTransformsMigrated
This change implements the Migrated callback, proxying to
onIpSecTransformCreated

Bug: 180163196
Test: atest FrameworksVcnTests
Change-Id: Ibf07be667882ea35a4d7191b87d1193f38f9db3e
2021-02-16 22:10:42 +00:00
Treehugger Robot
f7678be6bf Merge "Cleanup of Zygote files" am: 6fca4110dc am: c91fb923a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590611

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43db62c8e3a3f648f45cc985d132437af6759c3c
2021-02-16 21:19:14 +00:00
Treehugger Robot
c91fb923a6 Merge "Cleanup of Zygote files" am: 6fca4110dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590611

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9123313e1f2f9745347f8cc2c38eedf55a2cd81e
2021-02-16 20:41:51 +00:00
Treehugger Robot
6fca4110dc Merge "Cleanup of Zygote files" 2021-02-16 20:08:07 +00:00
Treehugger Robot
c4bd236e22 Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" am: 2a2456d3a4 am: 2d4714ec65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6884503e2df2b28465443d7cea2393d39ffbffcd
2021-02-16 18:51:21 +00:00
Chris Wailes
c31c4f9b31 Cleanup of Zygote files
This CL cleans up some warnings in the ZygoteInit.java and
ZygoteServer.java files.  These warnings were mostly about unused
variables, protection class changes, and dead code.  Some changes
to code in Zygote.java and ZygoteConnection.java were needed due to
function signature changes.

Test: Built and booted image
Merged-In: I6ba33cfcb4729a75dbbd4f908f4b46110d3bb991
Change-Id: I6ba33cfcb4729a75dbbd4f908f4b46110d3bb991
2021-02-16 10:23:47 -08:00
Treehugger Robot
2d4714ec65 Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" am: 2a2456d3a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38baa7aeefe2f779c3ae651154ea2c3958bb0882
2021-02-16 18:22:35 +00:00
Bram Bonné
a06ffa1395 Merge "Expand documentation for PURPOSE_AGREE_KEY" am: 6d3bd2dca6 am: 4f8bcd4261
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8902f84a28b5e588f45e9150aa5c7dc51db73174
2021-02-16 18:16:28 +00:00
Treehugger Robot
2a2456d3a4 Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" 2021-02-16 17:58:25 +00:00
Cody Kesting
a282ea505f Implement Safemode alarm in VcnGatewayConnection.
This CL updates VcnGatewayConnection to use WakeupMessages to support
Safemode detection. Safemode is entered if the VcnGatewayConnection
instance takes more than SAFEMODE_TIMEOUT_SECONDS seconds to a) go from
DisconnectedState to ConnectedState, or b) exit and re-enter
ConnectedState. If this timeout is exceeded, the instance will notify
its managing Vcn via VcnGatewayStatusCallback#onEnteredSafemode.

Bug: 178140973
Test: atest FrameworksVcnTests
Change-Id: Iff40aba639b465c3959ef383f1001be419daba4d
2021-02-16 09:46:07 -08:00
Bram Bonné
4f8bcd4261 Merge "Expand documentation for PURPOSE_AGREE_KEY" am: 6d3bd2dca6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib99934e872bd05e6e3f13b091583fb00f6cd3517
2021-02-16 17:36:37 +00:00
Bram Bonné
6d3bd2dca6 Merge "Expand documentation for PURPOSE_AGREE_KEY" 2021-02-16 17:05:00 +00:00
Cody Kesting
e060ec817c Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." am: b244bfa4d6 am: fa7111f96a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I902ed407efa601a1f1ec9ec805aa69da2ccbc22a
2021-02-16 15:57:20 +00:00
Cody Kesting
2429c94f13 Merge "Acquire WakeLock while processing Gateway messages." am: 864b62491d am: 5cf38e3d13
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571012

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I321b0209ed91a899aff486fab059ae00305eaa47
2021-02-16 15:57:10 +00:00
Treehugger Robot
70d6495d4d [automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: fc00dda2e9 -s ours
am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a414 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7396eb4c772714f142c2c1f3831efa533772159b
2021-02-16 15:56:35 +00:00
Cody Kesting
fa7111f96a Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." am: b244bfa4d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ff4e8c5b7ec0cf8cf32cdb9f9728fe53c7a7f28
2021-02-16 15:22:17 +00:00
Cody Kesting
5cf38e3d13 Merge "Acquire WakeLock while processing Gateway messages." am: 864b62491d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571012

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b0d112a150a7fcda68b91a2f590a30fbf80245e
2021-02-16 15:20:08 +00:00
Treehugger Robot
fc00dda2e9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b9d7ed1e439f69ea73015173759c5ca2ee1ac89
2021-02-16 15:16:27 +00:00
Cody Kesting
b244bfa4d6 Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." 2021-02-16 14:54:30 +00:00
Cody Kesting
864b62491d Merge "Acquire WakeLock while processing Gateway messages." 2021-02-16 14:54:16 +00:00
Treehugger Robot
fcf6560011 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-02-16 14:50:57 +00:00
Treehugger Robot
057bac2724 Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f55 am: 131d03d6bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e0bd75b8a65fc39288a6f92e8d5473060ccbd95
2021-02-16 12:51:51 +00:00
Benjamin Franz
8964ef6743 Merge "Add versioning to app compat framework" am: 80bbdfd100 am: 4fb9af6ced
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b38edb7136852c5ecf78e0a4ad0266c77a453a
2021-02-16 12:51:34 +00:00
Treehugger Robot
131d03d6bf Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e071da6ca9f3cbd3b6353b9f0bd817b8186d31
2021-02-16 12:25:24 +00:00
Benjamin Franz
4fb9af6ced Merge "Add versioning to app compat framework" am: 80bbdfd100
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4796325c84396082256cec7c66fd1efdc623d36
2021-02-16 12:21:08 +00:00
Treehugger Robot
6916f91f55 Merge "Prevent tests with reboot from running during presubmit" 2021-02-16 12:15:16 +00:00
Bob Badour
051ef786ac [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
  apct-tests/perftests/autofill/Android.bp
  apct-tests/perftests/blobstore/Android.bp
  apct-tests/perftests/core/Android.bp
  apct-tests/perftests/core/apps/overlay/Android.bp
  apct-tests/perftests/core/apps/reources_manager/Android.bp
  apct-tests/perftests/core/jni/Android.bp
  apct-tests/perftests/multiuser/Android.bp
  apct-tests/perftests/multiuser/apps/dummyapp/Android.bp
  apct-tests/perftests/packagemanager/Android.bp
  apct-tests/perftests/packagemanager/apps/query-all/Android.bp
  apct-tests/perftests/textclassifier/Android.bp
  apct-tests/perftests/utils/Android.bp
  apct-tests/perftests/windowmanager/Android.bp
  apex/Android.bp
  apex/blobstore/framework/Android.bp
  apex/blobstore/service/Android.bp
  apex/jobscheduler/framework/Android.bp
  apex/jobscheduler/service/Android.bp
  apex/media/Android.bp
  apex/media/aidl/Android.bp
  apex/media/framework/Android.bp
  cmds/am/Android.bp
  cmds/app_process/Android.bp
  cmds/appops/Android.bp
  cmds/appwidget/Android.bp
  cmds/backup/Android.bp
  cmds/bmgr/Android.bp
  cmds/bootanimation/Android.bp
  cmds/bu/Android.bp
  cmds/content/Android.bp
  cmds/dpm/Android.bp
  cmds/hid/Android.bp
  cmds/hid/jni/Android.bp
  cmds/idmap2/Android.bp
  cmds/ime/Android.bp
  cmds/incident/Android.bp
  cmds/incident_helper/Android.bp
  cmds/incidentd/Android.bp
  cmds/input/Android.bp
  cmds/interrupter/Android.bp
  cmds/locksettings/Android.bp
  cmds/pm/Android.bp
  cmds/requestsync/Android.bp
  cmds/screencap/Android.bp
  cmds/sm/Android.bp
  cmds/svc/Android.bp
  cmds/telecom/Android.bp
  cmds/uiautomator/Android.bp
  cmds/uiautomator/cmds/uiautomator/Android.bp
  cmds/uiautomator/instrumentation/Android.bp
  cmds/uiautomator/library/Android.bp
  cmds/vr/Android.bp
  cmds/wm/Android.bp
  config/Android.bp
  core/java/android/service/wallpaper/Android.bp
  core/jni/Android.bp
  core/sysprop/Android.bp
  core/tests/BroadcastRadioTests/Android.bp
  core/tests/ConnectivityManagerTest/Android.bp
  core/tests/PackageInstallerSessions/Android.bp
  core/tests/PlatformCompatFramework/Android.bp
  core/tests/bandwidthtests/Android.bp
  core/tests/benchmarks/Android.bp
  core/tests/bluetoothtests/Android.bp
  core/tests/bugreports/Android.bp
  core/tests/coretests/Android.bp
  core/tests/coretests/BinderDeathRecipientHelperApp/Android.bp
  core/tests/coretests/BinderProxyCountingTestApp/Android.bp
  core/tests/coretests/BinderProxyCountingTestService/Android.bp
  core/tests/coretests/BstatsTestApp/Android.bp
  core/tests/coretests/DisabledTestApp/Android.bp
  core/tests/coretests/EnabledTestApp/Android.bp
  core/tests/coretests/aidl/Android.bp
  core/tests/coretests/apks/Android.bp
  core/tests/coretests/apks/install/Android.bp
  core/tests/coretests/apks/install_bad_dex/Android.bp
  core/tests/coretests/apks/install_complete_package_info/Android.bp
  core/tests/coretests/apks/install_decl_perm/Android.bp
  core/tests/coretests/apks/install_jni_lib/Android.bp
  core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.bp
  core/tests/coretests/apks/install_loc_auto/Android.bp
  core/tests/coretests/apks/install_loc_internal/Android.bp
  core/tests/coretests/apks/install_loc_sdcard/Android.bp
  core/tests/coretests/apks/install_loc_unspecified/Android.bp
  core/tests/coretests/apks/install_use_perm_good/Android.bp
  core/tests/coretests/apks/install_uses_feature/Android.bp
  core/tests/coretests/apks/install_verifier_bad/Android.bp
  core/tests/coretests/apks/install_verifier_good/Android.bp
  core/tests/coretests/apks/keyset/Android.bp
  core/tests/coretests/apks/locales/Android.bp
  core/tests/coretests/apks/overlay_config/Android.bp
  core/tests/coretests/apks/version/Android.bp
  core/tests/coretests/apks/version_nosys/Android.bp
  core/tests/featureflagtests/Android.bp
  core/tests/hdmitests/Android.bp
  core/tests/hosttests/test-apps/AutoLocTestApp/Android.bp
  core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v1/Android.bp
  core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v2/Android.bp
  core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.bp
  core/tests/hosttests/test-apps/ExternalLocPermsFLTestApp/Android.bp
  core/tests/hosttests/test-apps/ExternalLocTestApp/Android.bp
  core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v1/Android.bp
  core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v2/Android.bp
  core/tests/hosttests/test-apps/ExternalSharedPerms/Android.bp
  core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.bp
  core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.bp
  core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.bp
  core/tests/hosttests/test-apps/InternalLocTestApp/Android.bp
  core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp
  core/tests/hosttests/test-apps/NoLocTestApp/Android.bp
  core/tests/hosttests/test-apps/NoLocVersionedTestApp_v1/Android.bp
  core/tests/hosttests/test-apps/NoLocVersionedTestApp_v2/Android.bp
  core/tests/hosttests/test-apps/SharedUid/32/Android.bp
  core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp
  core/tests/hosttests/test-apps/SharedUid/64/Android.bp
  core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp
  core/tests/hosttests/test-apps/SharedUid/dual/Android.bp
  core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp
  core/tests/hosttests/test-apps/SharedUid/java_only/Android.bp
  core/tests/hosttests/test-apps/SimpleTestApp/Android.bp
  core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v1_ext/Android.bp
  core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v2_int/Android.bp
  core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v1_ext/Android.bp
  core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v2_none/Android.bp
  core/tests/hosttests/test-apps/VersatileTestApp_Auto/Android.bp
  core/tests/hosttests/test-apps/VersatileTestApp_External/Android.bp
  core/tests/hosttests/test-apps/VersatileTestApp_Internal/Android.bp
  core/tests/hosttests/test-apps/VersatileTestApp_None/Android.bp
  core/tests/mockingcoretests/Android.bp
  core/tests/notificationtests/Android.bp
  core/tests/overlaytests/device/Android.bp
  core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
  core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
  core/tests/overlaytests/device/test-apps/FrameworkOverlay/Android.bp
  core/tests/overlaytests/host/Android.bp
  core/tests/overlaytests/remount/Android.bp
  core/tests/overlaytests/remount/test-apps/Overlay/Android.bp
  core/tests/overlaytests/remount/test-apps/SharedLibrary/Android.bp
  core/tests/overlaytests/remount/test-apps/SharedLibraryOverlay/Android.bp
  core/tests/overlaytests/remount/test-apps/Target/Android.bp
  core/tests/packagemanagertests/Android.bp
  core/tests/privacytests/Android.bp
  core/tests/screenshothelpertests/Android.bp
  core/tests/systemproperties/Android.bp
  core/tests/utillib/Android.bp
  core/tests/utiltests/Android.bp
  core/tests/utiltests/jni/Android.bp
  core/tests/uwbtests/Android.bp
  core/xsd/Android.bp
  core/xsd/vts/Android.bp
  data/etc/Android.bp
  data/etc/car/Android.bp
  data/fonts/Android.bp
  data/keyboards/Android.mk
  drm/jni/Android.bp
  errorprone/Android.bp
  graphics/proto/Android.bp
  keystore/Android.bp
  keystore/tests/Android.bp
  libs/WindowManager/Jetpack/Android.bp
  libs/WindowManager/Shell/Android.bp
  libs/WindowManager/Shell/tests/Android.bp
  libs/androidfw/Android.bp
  libs/androidfw/fuzz/resourcefile_fuzzer/Android.bp
  libs/hostgraphics/Android.bp
  libs/incident/Android.bp
  libs/input/Android.bp
  libs/input/tests/Android.bp
  libs/protoutil/Android.bp
  libs/services/Android.bp
  libs/storage/Android.bp
  libs/usb/tests/AccessoryChat/Android.bp
  libs/usb/tests/AccessoryChat/accessorychat/Android.bp
  location/lib/Android.bp
  location/tests/Android.bp
  location/tests/locationtests/Android.bp
  lowpan/tests/Android.bp
  media/Android.bp
  media/java/Android.bp
  media/java/android/media/tv/tunerresourcemanager/Android.bp
  media/jni/Android.bp
  media/jni/audioeffect/Android.bp
  media/jni/soundpool/Android.bp
  media/jni/soundpool/tests/Android.bp
  media/lib/remotedisplay/Android.bp
  media/lib/signer/Android.bp
  media/lib/tvremote/Android.bp
  media/lib/tvremote/tests/Android.bp
  media/mca/filterfw/Android.bp
  media/mca/filterfw/native/Android.bp
  media/mca/filterpacks/Android.bp
  media/mca/samples/CameraEffectsRecordingSample/Android.bp
  media/mca/tests/Android.bp
  media/native/midi/Android.bp
  media/packages/BluetoothMidiService/Android.bp
  media/packages/BluetoothMidiService/tests/unit/Android.bp
  media/tests/AudioPolicyTest/Android.bp
  media/tests/CameraBrowser/Android.bp
  media/tests/EffectsTest/Android.bp
  media/tests/MediaDump/Android.bp
  media/tests/MediaFrameworkTest/Android.bp
  media/tests/MediaRouter/Android.bp
  media/tests/MtpTests/Android.bp
  media/tests/ScoAudioTest/Android.bp
  media/tests/SoundPoolTest/Android.bp
  media/tests/TunerTest/Android.bp
  media/tests/audiotests/Android.bp
  media/tests/players/Android.bp
  mime/Android.bp
  native/android/Android.bp
  native/graphics/jni/Android.bp
  native/webview/loader/Android.bp
  nfc-extras/Android.bp
  nfc-extras/tests/Android.bp
  packages/AppPredictionLib/Android.bp
  packages/BackupEncryption/Android.bp
  packages/BackupEncryption/test/robolectric-integration/Android.bp
  packages/BackupEncryption/test/robolectric/Android.bp
  packages/BackupEncryption/test/unittest/Android.bp
  packages/BackupRestoreConfirmation/Android.bp
  packages/CarSystemUI/Android.bp
  packages/CarrierDefaultApp/Android.bp
  packages/CarrierDefaultApp/tests/unit/Android.bp
  packages/CompanionDeviceManager/Android.bp
  packages/Connectivity/framework/Android.bp
  packages/Connectivity/service/Android.bp
  packages/CtsShim/Android.bp
  packages/CtsShim/build/Android.bp
  packages/CtsShim/build/jni/Android.bp
  packages/DynamicSystemInstallationService/Android.bp
  packages/DynamicSystemInstallationService/tests/Android.bp
  packages/EasterEgg/Android.bp
  packages/EncryptedLocalTransport/Android.bp
  packages/ExtShared/Android.bp
  packages/ExternalStorageProvider/Android.bp
  packages/ExternalStorageProvider/tests/Android.bp
  packages/FakeOemFeatures/Android.bp
  packages/FusedLocation/Android.bp
  packages/InputDevices/Android.bp
  packages/LocalTransport/Android.bp
  packages/PackageInstaller/Android.bp
  packages/PrintRecommendationService/Android.bp
  packages/PrintSpooler/Android.bp
  packages/PrintSpooler/jni/Android.bp
  packages/PrintSpooler/tests/outofprocess/Android.bp
  packages/SettingsLib/ActionBarShadow/Android.bp
  packages/SettingsLib/ActionButtonsPreference/Android.bp
  packages/SettingsLib/AdaptiveIcon/Android.bp
  packages/SettingsLib/Android.bp
  packages/SettingsLib/AppPreference/Android.bp
  packages/SettingsLib/BarChartPreference/Android.bp
  packages/SettingsLib/DisplayDensityUtils/Android.bp
  packages/SettingsLib/EntityHeaderWidgets/Android.bp
  packages/SettingsLib/HelpUtils/Android.bp
  packages/SettingsLib/LayoutPreference/Android.bp
  packages/SettingsLib/ProgressBar/Android.bp
  packages/SettingsLib/RadioButtonPreference/Android.bp
  packages/SettingsLib/RestrictedLockUtils/Android.bp
  packages/SettingsLib/SchedulesProvider/Android.bp
  packages/SettingsLib/SearchProvider/Android.bp
  packages/SettingsLib/SearchWidget/Android.bp
  packages/SettingsLib/SettingsSpinner/Android.bp
  packages/SettingsLib/SettingsTheme/Android.bp
  packages/SettingsLib/Tile/Android.bp
  packages/SettingsLib/Utils/Android.bp
  packages/SettingsLib/search/Android.bp
  packages/SettingsLib/tests/integ/Android.bp
  packages/SettingsLib/tests/robotests/Android.bp
  packages/SettingsProvider/Android.bp
  packages/SharedStorageBackup/Android.bp
  packages/Shell/Android.bp
  packages/Shell/tests/Android.bp
  packages/SimAppDialog/Android.bp
  packages/SoundPicker/Android.bp
  packages/StatementService/Android.bp
  packages/SystemUI/Android.bp
  packages/SystemUI/plugin/Android.bp
  packages/SystemUI/plugin/ExamplePlugin/Android.bp
  packages/SystemUI/plugin_core/Android.bp
  packages/SystemUI/shared/Android.bp
  packages/VpnDialogs/Android.bp
  packages/WAPPushManager/Android.bp
  packages/WAPPushManager/tests/Android.bp
  packages/WallpaperBackup/Android.bp
  packages/WallpaperCropper/Android.bp
  packages/overlays/Android.mk
  packages/overlays/tests/Android.bp
  packages/services/PacProcessor/Android.bp
  packages/services/PacProcessor/jni/Android.bp
  packages/services/Proxy/Android.bp
  proto/Android.bp
  rs/jni/Android.mk
  samples/demo/haptic-assessment/Android.bp
  sax/tests/saxtests/Android.bp
  services/Android.bp
  services/accessibility/Android.bp
  services/appprediction/Android.bp
  services/appwidget/Android.bp
  services/autofill/Android.bp
  services/backup/Android.bp
  services/backup/backuplib/Android.bp
  services/companion/Android.bp
  services/contentcapture/Android.bp
  services/contentsuggestions/Android.bp
  services/core/Android.bp
  services/core/java/com/android/server/vcn/Android.bp
  services/core/jni/Android.bp
  services/core/xsd/Android.bp
  services/core/xsd/vts/Android.bp
  services/coverage/Android.bp
  services/devicepolicy/Android.bp
  services/incremental/Android.bp
  services/midi/Android.bp
  services/net/Android.bp
  services/people/Android.bp
  services/print/Android.bp
  services/profcollect/Android.bp
  services/restrictions/Android.bp
  services/robotests/Android.bp
  services/robotests/backup/Android.bp
  services/systemcaptions/Android.bp
  services/tests/PackageManagerComponentOverrideTests/Android.bp
  services/tests/PackageManagerServiceTests/host/Android.bp
  services/tests/PackageManagerServiceTests/host/test-apps/Android.bp
  services/tests/mockingservicestests/Android.bp
  services/tests/rescueparty/Android.bp
  services/tests/servicestests/Android.bp
  services/tests/servicestests/aidl/Android.bp
  services/tests/servicestests/apks/Android.bp
  services/tests/servicestests/apks/install-split-base/Android.bp
  services/tests/servicestests/apks/install-split-feature-a/Android.bp
  services/tests/servicestests/apks/install_intent_filters/Android.bp
  services/tests/servicestests/apks/install_uses_sdk/Android.bp
  services/tests/servicestests/test-apps/ConnTestApp/Android.bp
  services/tests/servicestests/test-apps/JobTestApp/Android.bp
  services/tests/servicestests/test-apps/PackageParserApp/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  services/tests/servicestests/test-apps/SimpleServiceTestApp/Android.bp
  services/tests/servicestests/test-apps/SuspendTestApp/Android.bp
  services/tests/shortcutmanagerutils/Android.bp
  services/tests/uiservicestests/Android.bp
  services/tests/wmtests/Android.bp
  services/usage/Android.bp
  services/usb/Android.bp
  services/voiceinteraction/Android.bp
  services/wifi/Android.bp
  startop/apps/test/Android.bp
  startop/iorap/Android.bp
  startop/iorap/functional_tests/Android.bp
  startop/iorap/stress/Android.bp
  startop/iorap/tests/Android.bp
  startop/view_compiler/Android.bp
  startop/view_compiler/dex_builder_test/Android.bp
  test-base/hiddenapi/Android.bp
  test-mock/Android.bp
  test-runner/tests/Android.bp
  tests/AccessibilityEventsLogger/Android.bp
  tests/AccessoryDisplay/common/Android.bp
  tests/AccessoryDisplay/sink/Android.bp
  tests/AccessoryDisplay/source/Android.bp
  tests/ActivityManagerPerfTests/stub-app/Android.bp
  tests/ActivityManagerPerfTests/test-app/Android.bp
  tests/ActivityManagerPerfTests/tests/Android.bp
  tests/ActivityManagerPerfTests/utils/Android.bp
  tests/ActivityTests/Android.bp
  tests/ActivityViewTest/Android.bp
  tests/AmSlam/Android.bp
  tests/ApkVerityTest/Android.bp
  tests/ApkVerityTest/ApkVerityTestApp/Android.bp
  tests/ApkVerityTest/block_device_writer/Android.bp
  tests/AppLaunch/Android.bp
  tests/AppLaunchWear/Android.bp
  tests/AppResourcesLoaders/Android.bp
  tests/AppResourcesLoaders/Overlay/Android.bp
  tests/Assist/Android.bp
  tests/AutoVerify/app1/Android.bp
  tests/AutoVerify/app2/Android.bp
  tests/AutoVerify/app3/Android.bp
  tests/AutoVerify/app4/Android.bp
  tests/BackgroundDexOptServiceIntegrationTests/Android.bp
  tests/BandwidthTests/Android.bp
  tests/BatteryWaster/Android.bp
  tests/BiDiTests/Android.bp
  tests/BlobStoreTestUtils/Android.bp
  tests/BootImageProfileTest/Android.bp
  tests/BrowserPowerTest/Android.bp
  tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
  tests/CameraPrewarmTest/Android.bp
  tests/Codegen/Android.bp
  tests/Compatibility/Android.bp
  tests/CoreTests/android/Android.bp
  tests/DataIdleTest/Android.bp
  tests/DozeTest/Android.bp
  tests/DpiTest/Android.bp
  tests/DynamicCodeLoggerIntegrationTests/Android.mk
  tests/FeatureSplit/base/Android.bp
  tests/FeatureSplit/feature1/Android.bp
  tests/FeatureSplit/feature2/Android.bp
  tests/FixVibrateSetting/Android.bp
  tests/FlickerTests/Android.bp
  tests/FlickerTests/test-apps/Android.bp
  tests/FlickerTests/test-apps/flickerapp/Android.bp
  tests/FrameworkPerf/Android.bp
  tests/GamePerformance/Android.bp
  tests/GridLayoutTest/Android.bp
  tests/HierarchyViewerTest/Android.bp
  tests/HugeBackup/Android.bp
  tests/HwAccelerationTest/Android.bp
  tests/Internal/Android.bp
  tests/JankBench/Android.bp
  tests/JobSchedulerPerfTests/Android.bp
  tests/JobSchedulerTestApp/Android.bp
  tests/LargeAssetTest/Android.bp
  tests/LegacyAssistant/Android.bp
  tests/LocalizationTest/Android.bp
  tests/LocationTracker/Android.bp
  tests/LotsOfApps/Android.bp
  tests/LowStorageTest/Android.bp
  tests/ManagedProfileLifecycleStressTest/Android.bp
  tests/ManagedProfileLifecycleStressTest/app/DummyDPC/Android.bp
  tests/MemoryUsage/Android.bp
  tests/MirrorSurfaceTest/Android.bp
  tests/NativeProcessesMemoryTest/Android.bp
  tests/NetworkSecurityConfigTest/Android.bp
  tests/NullHomeTest/Android.bp
  tests/OdmApps/Android.bp
  tests/OdmApps/app/Android.bp
  tests/OdmApps/priv-app/Android.bp
  tests/OneMedia/Android.bp
  tests/PackageWatchdog/Android.bp
  tests/PlatformCompatGating/Android.bp
  tests/PlatformCompatGating/test-rules/Android.bp
  tests/ProtoInputStreamTests/Android.bp
  tests/RemoteDisplayProvider/Android.bp
  tests/RenderThreadTest/Android.bp
  tests/RollbackTest/Android.bp
  tests/SerialChat/Android.bp
  tests/ServiceCrashTest/Android.bp
  tests/SharedLibrary/client/Android.bp
  tests/SharedLibrary/lib/Android.bp
  tests/ShowWhenLockedApp/Android.bp
  tests/SmokeTest/Android.bp
  tests/SmokeTest/tests/Android.bp
  tests/SmokeTestApps/Android.bp
  tests/SoundTriggerTestApp/Android.bp
  tests/Split/Android.bp
  tests/StagedInstallTest/Android.bp
  tests/StatusBar/Android.bp
  tests/SurfaceComposition/Android.bp
  tests/SurfaceControlViewHostTest/Android.bp
  tests/SystemMemoryTest/device/Android.bp
  tests/SystemMemoryTest/host/Android.bp
  tests/SystemUIDemoModeController/Android.bp
  tests/TaskOrganizerTest/Android.bp
  tests/TelephonyCommonTests/Android.bp
  tests/TouchLatency/Android.bp
  tests/TransformTest/Android.bp
  tests/TtsTests/Android.bp
  tests/UiBench/Android.bp
  tests/UsageReportingTest/Android.bp
  tests/UsageStatsPerfTests/Android.bp
  tests/UsageStatsTest/Android.bp
  tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp
  tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp
  tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp
  tests/UsbManagerTests/Android.bp
  tests/UsbManagerTests/lib/Android.bp
  tests/UsbTests/Android.bp
  tests/UsesFeature2Test/Android.bp
  tests/VectorDrawableTest/Android.bp
  tests/VoiceEnrollment/Android.bp
  tests/VoiceInteraction/Android.bp
  tests/WallpaperTest/Android.bp
  tests/WindowAnimationJank/Android.bp
  tests/WindowInsetsTests/Android.bp
  tests/appwidgets/AppWidgetHostTest/Android.bp
  tests/appwidgets/AppWidgetProviderTest/Android.bp
  tests/backup/Android.mk
  tests/benchmarks/Android.bp
  tests/libs-permissions/Android.bp
  tests/net/Android.bp
  tests/net/common/Android.bp
  tests/net/deflake/Android.bp
  tests/net/integration/Android.bp
  tests/net/jni/Android.bp
  tests/net/smoketest/Android.bp
  tests/notification/Android.bp
  tests/permission/Android.bp
  tests/privapp-permissions/Android.bp
  tests/testables/Android.bp
  tests/testables/tests/Android.bp
  tests/utils/StubIME/Android.bp
  tests/utils/hostutils/Android.bp
  tests/utils/testutils/Android.bp
  tests/vcn/Android.bp
  tools/aapt/Android.bp
  tools/aapt2/Android.bp
  tools/aapt2/integration-tests/AutoVersionTest/Android.bp
  tools/aapt2/integration-tests/BasicTest/Android.bp
  tools/aapt2/integration-tests/MergeOnlyTest/LeafLib/Android.mk
  tools/aapt2/integration-tests/MergeOnlyTest/LocalLib/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk
  tools/aapt2/integration-tests/StaticLibTest/App/Android.bp
  tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.bp
  tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.bp
  tools/aapt2/integration-tests/SymlinkTest/Android.bp
  tools/bit/Android.bp
  tools/codegen/Android.bp
  tools/dump-coverage/Android.bp
  tools/incident_report/Android.bp
  tools/incident_section_gen/Android.bp
  tools/lock_agent/Android.bp
  tools/locked_region_code_injection/Android.bp
  tools/obbtool/Android.bp
  tools/powermodel/Android.bp
  tools/preload-check/Android.bp
  tools/preload-check/device/Android.bp
  tools/preload/loadclass/Android.bp
  tools/processors/staledataclass/Android.bp
  tools/processors/view_inspector/Android.bp
  tools/protologtool/Android.bp
  tools/sdkparcelables/Android.bp
  tools/split-select/Android.bp
  tools/streaming_proto/Android.bp
  tools/validatekeymaps/Android.bp
  wifi/java/Android.bp
  wifi/tests/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  libs/hwui/Android.bp
  native/webview/plat_support/Android.bp
  obex/Android.bp

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

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    legacy_unencumbered
to:
  core/java/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
  test-base/Android.bp
  test-runner/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL
to:
  core/res/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0
to:
  libs/usb/Android.bp
  libs/usb/tests/accessorytest/Android.bp

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

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-Unicode-DFS
to:
  api/Android.bp
  boot/Android.bp
  cmds/device_config/Android.bp
  cmds/settings/Android.bp
  core/api/Android.bp
  core/tests/coretests/certs/Android.bp
  core/tests/overlaytests/remount/test-apps/certs/Android.bp
  core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp
  core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp
  libs/tracingproxy/Android.bp
  services/startop/Android.bp
  test-legacy/Android.mk
  tests/ApkVerityTest/testdata/Android.bp
  tests/TransitionTests/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work

Change-Id: Ic44d662936d1ff0cae7fbe915932b37aa4e4869a
Merged-in: I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06
2021-02-16 04:09:57 -08:00
Benjamin Franz
80bbdfd100 Merge "Add versioning to app compat framework" 2021-02-16 11:48:36 +00:00
Lorenzo Colitti
81d3a2bd65 Merge "New API for getting uids have specific permissions from SystemConfig" am: b8d9e77b2a am: ee109d8f3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If61fdc1cab61c9510ac3ae0ba193c45f9b59925e
2021-02-16 10:48:52 +00:00
Lorenzo Colitti
ee109d8f3b Merge "New API for getting uids have specific permissions from SystemConfig" am: b8d9e77b2a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74be68b10c791d19a3b4287a91bcc1d1c174f647
2021-02-16 09:09:31 +00:00
Lorenzo Colitti
b8d9e77b2a Merge "New API for getting uids have specific permissions from SystemConfig" 2021-02-16 08:24:21 +00:00
TreeHugger Robot
ff962af44a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 087715166a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13574907

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d036597e2eae1be2c96f99e3dd115a3f5749135
2021-02-16 08:20:03 +00:00
Lorenzo Colitti
438ac4a7f2 Use UserHandles instead of userId integers.
userId integers are not public API and code should use UserHandle
instead.

Bug: 170598012
Test: passes existing tests
Change-Id: Ic27b93ccfe6bbc97e7419293ce165fee6cd51e6d
2021-02-16 08:06:23 +00:00
TreeHugger Robot
087715166a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-16 08:00:23 +00:00
Frank Li
952d747c72 Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f am: 23d31b0274
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6d8d56a79bd7f8751c3604a292f2bb8c34fd765
2021-02-16 03:42:49 +00:00
Frank Li
23d31b0274 Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92df8ef58e30ddefb84001a0b45363e82fdd3621
2021-02-16 03:08:00 +00:00
Frank Li
5f2492095f Merge "[CS01]Remove hidden API usage of NetworkCapabilities" 2021-02-16 02:42:53 +00:00