b2e01519b2238d5ceb2de135769d971a9eca2eac
9a42d15d58 -s ours am: 56d12af418 -s ours am: d055ae1545 -s ours am: f425a04497 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14812656 Change-Id: I5d202d37e7fc02d725e79f7e0aa4ab4696a72f6c
Merge changes I6da18cdb,I9de6ba64,I1af88c6d,I154783ff into sc-dev am:
dc628e77a1 am: 9246beb4bd am: fd8380f389
Merge "Add emergency app to power-save allowlist" into sc-dev am:
e36c773634 am: 8291125946 am: 046d88db92
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am:
3b2decbb34 am: bc9360ea4e am: 791f088436
Merge "Set dist_group: "android" for frameworks/base java_sdk_libraries" into sc-dev am:
d1251db40d am: 276b22db59 am: abe1a2ed46
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Set dist_group: "android" for frameworks/base java_sdk_libraries" into sc-dev am:
d1251db40d am: 276b22db59 am: abe1a2ed46
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Remove occurances of disable blurs sysprop" into sc-dev am:
e5c0adddcf am: d61776c12a am: 704b583270
Merge "Fix potential exceptions in CallDiagnosticService and missing locks." into sc-dev am:
4fab561f27 am: bc0014b019 am: aeefddb072
Merge "Override equals and hashCode methods for EpsBearerQosSessionAttributes and NrQosSessionAttributes" into sc-dev am:
65b0d73c81 am: 1e60066548 am: cbb5c8241d
Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev am:
2debdb3ec2 am: b0409be590 am: e3b1213cfa
Merge "Apply the same filtering for docstubs and jarstubs" am:
46dff8e09f am: 8f1928f4ca am: 9e8186aaaf
…
Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am:
b82853357b am: 89aedd6cb8 am: af77c134d9
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%