Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638,959 Commits 3 Branches 0 Tags
c6360dababa92a0c09afb3b9569c99a652a2e6cd
Commit Graph

638959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wailes
c6360dabab Remove annotations that have been relocated 
These annotations have been relocated to frameworks/libs/modules-utils.
This CL removes the files and updates necessary build rules.

Bug: 183133670
Test: m
Merged-In: I834b9f5320e0b6fe8cb9feb7194c82085b805e07
Change-Id: I834b9f5320e0b6fe8cb9feb7194c82085b805e07
 2021-04-30 13:36:40 +00:00
Beth Thibodeau
9773696596 Merge "Update power menu text" into sc-dev 2021-04-30 02:10:15 +00:00
Alexander Dorokhine
9e85c65e03 Merge "Update Framework from Jetpack." into sc-dev 2021-04-30 01:07:39 +00:00
Treehugger Robot
997d0aa82e Merge "Add additional biometric OWNERs" am: 9674d6d6d6 am: 1176cad7f2 am: 3f0c3db187 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691211

Change-Id: I6d429cf95cdaec8ead1607154efacc972177a03c
 2021-04-30 01:02:04 +00:00
Alexander Dorokhine
45bb21c98d Update Framework from Jetpack. 
Included changes:
* 4c1b251: Sync AppSearch with google3 update ag/14342999 (8f8b43)
* cdf1913: Add a GenericDocument#toBuilder API.
* 64f80f3: Improve snippeting and matching per API feedback.
* 23dd35c: Move AppSearchEmail out of the prod tree into the test utils.

Bug: 171882200
Bug: 186520196
Bug: 186717514
Test: Presubmit
Change-Id: I9d8e1fb87e6e74c57a38f3a27cdd04a1a3ccf90b
 2021-04-29 18:00:32 -07:00
TreeHugger Robot
45997792e1 Merge "Fix 2 LaunchParamsPersister issues" into sc-dev 2021-04-30 00:46:52 +00:00
Treehugger Robot
3f0c3db187 Merge "Add additional biometric OWNERs" am: 9674d6d6d6 am: 1176cad7f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691211

Change-Id: Ie6d4938961f7725cc141dd1a43f69a906b913f24
 2021-04-30 00:35:10 +00:00
Matt Pietal
c3fd47a6f0 Merge "Wallet affordance - Fix taps" into sc-dev 2021-04-30 00:32:36 +00:00
Matt Pietal
2aecd8d73d Merge "AOD/LS - Fix 24 hour clock" into sc-dev 2021-04-30 00:32:12 +00:00
Beth Thibodeau
c077ca0ccd Merge "Fix timing issue for flaky tests" into sc-dev 2021-04-30 00:31:24 +00:00
Nate Myren
4399632290 Merge "Add RECORD_INCOMING_PHONE_AUDIO app op" into sc-dev 2021-04-30 00:30:20 +00:00
TreeHugger Robot
ed17f3e2c7 Merge "Change clearEvents() to clear existing events rather than setting mEvents to null to remove possible NPE." into sc-dev 2021-04-30 00:29:02 +00:00
Treehugger Robot
1176cad7f2 Merge "Add additional biometric OWNERs" am: 9674d6d6d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691211

Change-Id: Ic0ec9c3c12571b3405c1b7668528f5c50d083896
 2021-04-30 00:13:30 +00:00
Brad Ebinger
984d20822b Merge "Bound Telecom logging recursion" into sc-dev 2021-04-30 00:12:15 +00:00
Amy Zhang
75d890a7f3 Merge "Get media share memory handle only when the filter is not a passthrough media filter" into sc-dev 2021-04-30 00:02:05 +00:00
TreeHugger Robot
93203cb1d3 Merge "Update TODO docs in TunerClient on resource id/handle mapping" into sc-dev 2021-04-29 23:57:47 +00:00
TreeHugger Robot
bfc6048a9c Merge "[incremental] don't uninstall on unhealthy" into sc-dev 2021-04-29 23:54:24 +00:00
Treehugger Robot
9674d6d6d6 Merge "Add additional biometric OWNERs" 2021-04-29 23:52:46 +00:00
Automerger Merge Worker
3a1e0aa142 Merge "[automerger skipped] Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266 am: fc7a26cd21 am: 8f2e634505 -s ours" into sc-dev 2021-04-29 23:37:49 +00:00
Treehugger Robot
e25461b6ef [automerger skipped] Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266 am: fc7a26cd21 am: 8f2e634505 -s ours 
am skip reason: Merged-In Iac339e64812232875afa9dc6109b848b50b0ef2f with SHA-1 f53bf832bd is already in history

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

Change-Id: I8956c359f9f1cabd6375df5b143ddb71bf2523c3
 2021-04-29 23:37:38 +00:00
TreeHugger Robot
50e1340661 Merge "Part of compatibility getRaw() support" into sc-dev 2021-04-29 23:37:34 +00:00
Kelvin Zhang
2e9e91b5bb Merge "Add API to ApexManager for compressed APEX" am: 4890c80904 am: bce6d733a8 am: 9934485847 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675675

Change-Id: Ief56104fae0b743e9e8a6e8ad169f97e1127c991
 2021-04-29 23:36:58 +00:00
Nate Myren
c05d205e55 Merge "TEMP: note "RECORD_AUDIO_HOTWORD" in SoundTriggerMiddleware" into sc-dev 2021-04-29 23:18:48 +00:00
Abhijoy Saha
b4cea78181 Merge "Add phone call check to app opp usage callback." into sc-dev 2021-04-29 23:15:54 +00:00
George Mount
ee5ed9dfaa Merge "Fling while overscrolled: ScrollView/HorizontalScrollView" into sc-dev 2021-04-29 23:05:32 +00:00
Treehugger Robot
8f2e634505 Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266 am: fc7a26cd21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675900

Change-Id: I987c4a882529bf55ba9697889347b6a50b583942
 2021-04-29 23:03:32 +00:00
Kelvin Zhang
9934485847 Merge "Add API to ApexManager for compressed APEX" am: 4890c80904 am: bce6d733a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675675

Change-Id: Ic5a2ea0dcecfa4e2e2c470457c5ca3b44c65c23b
 2021-04-29 23:02:32 +00:00
TreeHugger Robot
80bd76c77a Merge "Handle STOPPED to PAUSED Usage events" into sc-dev 2021-04-29 23:02:08 +00:00
Mady Mellor
8e29f94a89 Merge "Fix text color for bubble user education screens" into sc-dev 2021-04-29 23:00:20 +00:00
Ben Lin
7fc1313d39 Merge "PiP: Take inset into consideration when calculating stash offset." into sc-dev 2021-04-29 22:51:26 +00:00
Treehugger Robot
fc7a26cd21 Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675900

Change-Id: Ibc8bdbcf832b90e3a5628829a6206374c9504374
 2021-04-29 22:43:19 +00:00
Taran Singh
2fef6def9a Merge "Add log for showSoftInput called from Insets API" into sc-dev 2021-04-29 22:41:26 +00:00
Kelvin Zhang
bce6d733a8 Merge "Add API to ApexManager for compressed APEX" am: 4890c80904 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675675

Change-Id: If4e1adb75ec311a7cddd1db28f76cf87da779529
 2021-04-29 22:37:33 +00:00
Treehugger Robot
b8e5426266 Merge "LockSettingsService: migrate to its own keystore namespace" 2021-04-29 22:35:52 +00:00
Jeff Sharkey
9a9fa815f1 Merge "Ensure privileged APIs require runtime permission." into sc-dev 2021-04-29 22:22:25 +00:00
Kelvin Zhang
4890c80904 Merge "Add API to ApexManager for compressed APEX" 2021-04-29 22:16:08 +00:00
TreeHugger Robot
7cdf712306 Merge "Skip FontFamily creation if the font files don't exists." into sc-dev 2021-04-29 22:08:35 +00:00
Kevin Chyn
bda79da64b Add additional biometric OWNERs 
Change-Id: I024252070bd806d50d54377190fdc5cd5b4445e1
 2021-04-29 15:07:35 -07:00
Sean Stout
8b9809f10d Merge "Fix sandman crash" into sc-dev 2021-04-29 22:04:20 +00:00
Winson Chung
54255f7ab4 Merge "Skip setting focused window to the recents animation target" into sc-dev 2021-04-29 22:02:14 +00:00
Beverly Tai
95531c2bb5 Merge "Add callback to DozeParameters on alwaysOn change" into sc-dev 2021-04-29 21:53:53 +00:00
TreeHugger Robot
ea1b5d878c Merge "Fixing empty PendingAlarmInfo after alarm store changes" into sc-dev 2021-04-29 21:51:18 +00:00
TreeHugger Robot
1461322b42 Merge "Re-enable AppOpsServiceTest#testShutdown" into sc-dev 2021-04-29 21:50:28 +00:00
Tracy Zhou
133e340e1d Merge "Add onSwipeToHomeFinished to OverviewProxyListener" into sc-dev 2021-04-29 21:43:19 +00:00
Martin Brabham
329a11f7c6 Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3 am: 50e294ad9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I00dc7f393edb9b562c97147d053302159c12fcdb
 2021-04-29 21:33:10 +00:00
Martin Brabham
d50c8e0703 OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd am: e897917de7 am: 2d3dbcab8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: Ia4d99bf5f2dcee3d688796dfa3e11c1d104132a1
 2021-04-29 21:32:57 +00:00
TreeHugger Robot
22fba34bba Merge "Grant CONTROL_CAR_POWER_POLICY permission to car shell" into sc-dev 2021-04-29 21:32:46 +00:00
Peter Collingbourne
a3b1c2e028 Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 am: b16d968e54 am: 43ce684e3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: I9472707d7d680ad63794ed4b61ecd1e4506ae5c5
 2021-04-29 21:32:03 +00:00
Jack Nudelman
71a0c99113 [automerger skipped] Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d am: 296cec5c58 am: 611a55f03d -s ours 
am skip reason: Merged-In I0b8af8fe6c9a34a56f9e2275df0a03ba093f439e with SHA-1 2cdad9f0a2 is already in history

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

Change-Id: If8adee8736161618173cc16f3c7d611beaafeca7
 2021-04-29 21:30:28 +00:00
Grace Jia
acdaa7e8d8 [automerger skipped] Add D2D sharing level setting APIs. am: d5eb6fb0ef am: f018ea3c3e am: 5585bdb0ec -s ours 
am skip reason: Merged-In I86f88d68c8629a0329dcde7b2d17928cacec37e7 with SHA-1 b53cb66e5f is already in history

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

Change-Id: I1dda8c96b0356db74ae93b90029e9a9062145d8d
 2021-04-29 21:30:07 +00:00