Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
635,217 Commits 3 Branches 0 Tags
4bcba57a8d71f05490fe5a577eeede006d591ff9
Commit Graph

635217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4bcba57a8d Merge "Add nullability annotations and imports" into sc-dev am: 3d345db0a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931662

Change-Id: I6ed7c3fb64569b5eeba01675160032fd70898ece
 2021-03-19 22:09:41 +00:00
TreeHugger Robot
71f60627fc Merge "Add light reveal for auth from aod" into sc-dev am: 30d9c2d2de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13888417

Change-Id: I1d84ea18f6f9326804b54ddcbc81bdb9484cabd9
 2021-03-19 22:08:56 +00:00
TreeHugger Robot
cd8df7b399 Merge "Fix CDM logcat spam when device is nearby" 2021-03-19 22:07:15 +00:00
TreeHugger Robot
3d345db0a4 Merge "Add nullability annotations and imports" into sc-dev 2021-03-19 22:00:53 +00:00
TreeHugger Robot
30d9c2d2de Merge "Add light reveal for auth from aod" into sc-dev 2021-03-19 21:50:55 +00:00
Jeff Sharkey
abfd883b8d Merge "OWNERS for a few Voice Interaction files." am: d702544c9f am: 32e4b44b47 am: cc506c3882 am: e0f6165387 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: Ie95fffaff13c9b04ace0ff05d46f6cbe6c2a3c93
 2021-03-19 21:50:29 +00:00
TreeHugger Robot
ceb6bd125c Merge "Add support for stretch overscroll to internal ViewPager" into sc-dev am: 72f1c8bca4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13828644

Change-Id: I2534f2d3092806f3b4cc468e4996b0ef43764b61
 2021-03-19 21:50:05 +00:00
Julia Reynolds
58949f6da8 Merge "Provide more specific notification cancelation reasons" 2021-03-19 21:23:45 +00:00
Jeff Sharkey
e0f6165387 Merge "OWNERS for a few Voice Interaction files." am: d702544c9f am: 32e4b44b47 am: cc506c3882 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: Idf7c352b2e90ef93d833ecb8896444c5228e53e7
 2021-03-19 21:17:00 +00:00
TreeHugger Robot
72f1c8bca4 Merge "Add support for stretch overscroll to internal ViewPager" into sc-dev 2021-03-19 21:15:34 +00:00
TreeHugger Robot
ce2cde0427 Merge "Correct recycling to take setViewId into account." into sc-dev am: e463f4c151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13929330

Change-Id: Ia8c0ea6a1a3d20081c11550cca5a1c6cedca80f2
 2021-03-19 20:55:39 +00:00
TreeHugger Robot
e463f4c151 Merge "Correct recycling to take setViewId into account." into sc-dev 2021-03-19 20:38:30 +00:00
Chris Tate
e4d9c67014 [automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into sc-dev am: c243f46c6f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacab172654c6f35ec44f1bb19c8a708230605a1c
 2021-03-19 20:38:09 +00:00
Branden Archer
2e41d9372b Merge "Allow PO to enable security logging on work profile" into sc-dev am: 30491b1daf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13744888

Change-Id: I89d18d88338c7078cc2399b5377f52ad25f576c2
 2021-03-19 20:37:47 +00:00
Shuzhen Wang
3e10cef517 Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a am: 7b8379f55d am: 71ca7dff7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I8a16120f2592327690e394e453f5e6223b8e7444
 2021-03-19 20:36:06 +00:00
Jeff Sharkey
cc506c3882 Merge "OWNERS for a few Voice Interaction files." am: d702544c9f am: 32e4b44b47 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: I60706a7e6b932a322720632017596f7e75bc9880
 2021-03-19 20:36:01 +00:00
Chris Tate
c243f46c6f Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into sc-dev 2021-03-19 20:27:43 +00:00
Branden Archer
30491b1daf Merge "Allow PO to enable security logging on work profile" into sc-dev 2021-03-19 20:24:30 +00:00
Shuzhen Wang
71ca7dff7e Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a am: 7b8379f55d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I16a4e5430872102f2650845d29f4a7ee7a4c7580
 2021-03-19 20:20:07 +00:00
TreeHugger Robot
85d151bd93 Merge "Limit primary text color to notification shelf icons" into sc-dev am: 452d2916b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13930906

Change-Id: I1dfb13f7a1a3cdc20c28c01d7984b22e5a27eb5e
 2021-03-19 20:16:14 +00:00
Jordan Liu
09d91d0642 [automerger skipped] Make backport_s_notif_rules readable am: 1dfc25617a -s ours 
am skip reason: skip tag Change-Id I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea with SHA-1 a5792f7402 is already in history

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

Change-Id: I01ffb0eadb2be9cc5e77fd7221ff7cf9386a77d7
 2021-03-19 20:16:03 +00:00
Nate Myren
d86bbd1b4f Merge "Clarify AudioRecord.Builder.setContext documentation" into sc-dev am: c3d290dcec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13901977

Change-Id: I41a9ed517b6d12c838ac9c5e72c11f35a490e889
 2021-03-19 20:15:52 +00:00
TreeHugger Robot
452d2916b9 Merge "Limit primary text color to notification shelf icons" into sc-dev 2021-03-19 20:15:02 +00:00
TreeHugger Robot
31395c10a1 Merge "Grant permission to shell for ResourceObserverNativeTest" into sc-dev am: c8593c879e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13903088

Change-Id: I303b101d12ec4649cd9e1304f7ee2b82eeb465d2
 2021-03-19 19:56:43 +00:00
Jeff Sharkey
32e4b44b47 Merge "OWNERS for a few Voice Interaction files." am: d702544c9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643650

Change-Id: Ic7929a7dea98f94a3e3d4082eeace63d6c6fe714
 2021-03-19 19:56:11 +00:00
Jordan Liu
1dfc25617a Make backport_s_notif_rules readable 
Bug: 182313963
Test: atest
Change-Id: I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea
(cherry picked from commit a5792f7402)
Merged-In: I4a0ba25a8a5f0674696a83e931ce2aa914c7e7ea
 2021-03-19 19:52:00 +00:00
Haining Chen
18e3b6aa9c Add nullability annotations and imports 
Bug: 156024031

Test: m -j
Test: atest com.android.server.biometrics
Test: atest com.android.systemui.biometrics
Test: atest CtsBiometricsTestCases
Change-Id: I46a38b6c02452a77c65c3bcb707c5db31c3a4ece
 2021-03-19 12:43:57 -07:00
Nate Myren
c3d290dcec Merge "Clarify AudioRecord.Builder.setContext documentation" into sc-dev 2021-03-19 19:42:31 +00:00
TreeHugger Robot
c8593c879e Merge "Grant permission to shell for ResourceObserverNativeTest" into sc-dev 2021-03-19 19:41:18 +00:00
Shuzhen Wang
7b8379f55d Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: Ib5a8d564723118065ef7a2b9e971f588f086ea2f
 2021-03-19 19:35:38 +00:00
Jeff Sharkey
d702544c9f Merge "OWNERS for a few Voice Interaction files." 2021-03-19 19:21:48 +00:00
Ying Xu
c4bf18578e Merge "Use different slots for no_calling and call_strength icons" into sc-dev am: 5a34763729 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13905201

Change-Id: I7a0cdc9e478601d5b145c67917cfb079aa5cb516
 2021-03-19 19:18:55 +00:00
Christine Franks
4a140be9a4 Merge "Fix order of params in color display help doc" into sc-dev am: 5590c983c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13832459

Change-Id: I52622f978bb63ac7be401ca06b05c479def53e54
 2021-03-19 19:18:25 +00:00
Julia Reynolds
f4a9e3ca36 Merge "Be more specific about media statuses" into sc-dev am: e363bcdbfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13922147

Change-Id: I4071ab8786478e1a53ce630eef43df432f0e424e
 2021-03-19 19:17:01 +00:00
Ying Xu
5a34763729 Merge "Use different slots for no_calling and call_strength icons" into sc-dev 2021-03-19 19:06:41 +00:00
Christine Franks
5590c983c1 Merge "Fix order of params in color display help doc" into sc-dev 2021-03-19 19:06:25 +00:00
Julia Reynolds
e363bcdbfa Merge "Be more specific about media statuses" into sc-dev 2021-03-19 19:01:23 +00:00
Yan Wang
35767886d9 Merge "Remove the reading of APK file." am: 08d5380762 am: 4f17d64ff8 am: f8fad064c1 am: 47067afdd2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646327

Change-Id: Id5c8129b6eec14d5344ebe253d5a90a85888feb5
 2021-03-19 18:59:38 +00:00
Treehugger Robot
98ea1ffefa Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: 3df03a83af am: f8583062fd am: c4ba925293 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645300

Change-Id: I4e8256904118f7cf1526a8f13c879ae1e016b8dc
 2021-03-19 18:59:13 +00:00
TreeHugger Robot
9e2c21ab32 Merge "Grant additional quota to installers." into sc-dev am: 3a910e42c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13690053

Change-Id: I77663b0e9fd69d05f3ef0439a86298c16b0da6b5
 2021-03-19 18:58:47 +00:00
TreeHugger Robot
803cfa859a Merge "Fix a timing issue in unlock signal propagation in AppSearch" into sc-dev am: 2cea467f9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921707

Change-Id: Ifa59614b1e45d533ff190951154229c9eaff346f
 2021-03-19 18:58:32 +00:00
Shuzhen Wang
f1f504042a Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I537e8fab411b8134cf43d71790ebe62d238a71b6
 2021-03-19 18:58:14 +00:00
TreeHugger Robot
22deb6a075 Merge "Allow the system to specify user-force when restricting." into sc-dev am: 06d70ab66d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13891833

Change-Id: I683818fabcb300902f4846c3380e186b8139e7d8
 2021-03-19 18:57:51 +00:00
Yan Wang
47067afdd2 Merge "Remove the reading of APK file." am: 08d5380762 am: 4f17d64ff8 am: f8fad064c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646327

Change-Id: I1a4d1f7dfac18af3dc92265c9076e0bafad145f1
 2021-03-19 18:45:00 +00:00
Treehugger Robot
c4ba925293 Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: 3df03a83af am: f8583062fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645300

Change-Id: I6b1aa628a1c48c4c7ed02a4d379cab2316b13526
 2021-03-19 18:44:03 +00:00
TreeHugger Robot
3a910e42c5 Merge "Grant additional quota to installers." into sc-dev 2021-03-19 18:40:32 +00:00
Shuzhen Wang
171249e857 Merge "Camera: Fix a removal-while-iterate bug" 2021-03-19 18:34:00 +00:00
TreeHugger Robot
2cea467f9b Merge "Fix a timing issue in unlock signal propagation in AppSearch" into sc-dev 2021-03-19 18:20:06 +00:00
TreeHugger Robot
06d70ab66d Merge "Allow the system to specify user-force when restricting." into sc-dev 2021-03-19 18:19:37 +00:00
Yan Wang
f8fad064c1 Merge "Remove the reading of APK file." am: 08d5380762 am: 4f17d64ff8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646327

Change-Id: Id5e54de124e2fa475e93281855d4af2d7a90255b
 2021-03-19 18:01:55 +00:00