Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
634,780 Commits 3 Branches 0 Tags
5eda07de819ae223efdbe2ee13cc804a0405042c
Commit Graph

634780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
5eda07de81 [automerger skipped] Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f am: 6f06dae1c3 -s ours am: bd38846660 -s ours 
am skip reason: skip tag Change-Id Idc9c7dc2614a47818227a06fe76078f72c0c1f57 with SHA-1 a1963a9b64 is already in history

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

Change-Id: I1ec49997479cf8119c6afa4520322f2bfd776740
 2021-03-19 03:10:46 +00:00
Treehugger Robot
44c8963cc8 [automerger skipped] Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f1b am: 02ee21ec65 am: d27fb1090a -s ours am: 579d132d4d -s ours 
am skip reason: skip tag Change-Id I0d71d3c9cdd586a508827eb26120c872cb8643ea with SHA-1 d2d4c69a66 is already in history

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

Change-Id: Ibbec363017dfb40c695f00bb23d5db9c4ada2b82
 2021-03-19 03:10:02 +00:00
Kai Shi
ba6240a7d3 [automerger skipped] Merge "Add the LCE system API" am: 26ba4d0d09 am: 855075a2c2 am: 1224d2650b -s ours am: e7c4fb3919 -s ours 
am skip reason: skip tag Change-Id I5899acf02006a164e31f9b82aeaa7974dd6d2869 with SHA-1 5d530fab23 is already in history

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

Change-Id: I688fa8acd3351a905acaef1d14bd1a9fc69dd46a
 2021-03-19 03:09:28 +00:00
Amit Mahajan
fb8d631ab4 [automerger skipped] Merge "Clarifying documentation for SliceInfo per API council feedback." am: afb77c6f83 am: ddc8641c01 am: f36b5ff898 -s ours am: 058270b9a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642743

Change-Id: I8c9627f90fcb153b195cdc2eb4b35015e174e3e1
 2021-03-19 03:08:58 +00:00
Lee Shombert
46bc7bb560 Merge "Move PM cache invalidate inside mlock" into sc-dev am: 561400372c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13903346

Change-Id: If144f432d8f1d3320f6f06bcfd7ec8ad16758023
 2021-03-19 03:06:44 +00:00
Treehugger Robot
bd38846660 [automerger skipped] Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f am: 6f06dae1c3 -s ours 
am skip reason: skip tag Change-Id Idc9c7dc2614a47818227a06fe76078f72c0c1f57 with SHA-1 a1963a9b64 is already in history

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

Change-Id: I8333348d82801b0a2b040f3f38cfa4ae6287c873
 2021-03-19 02:52:10 +00:00
Treehugger Robot
579d132d4d [automerger skipped] Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f1b am: 02ee21ec65 am: d27fb1090a -s ours 
am skip reason: skip tag Change-Id I0d71d3c9cdd586a508827eb26120c872cb8643ea with SHA-1 d2d4c69a66 is already in history

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

Change-Id: I7a1c3d61d224a86e074b14f33caeb9740b976da2
 2021-03-19 02:51:36 +00:00
Kai Shi
e7c4fb3919 [automerger skipped] Merge "Add the LCE system API" am: 26ba4d0d09 am: 855075a2c2 am: 1224d2650b -s ours 
am skip reason: skip tag Change-Id I5899acf02006a164e31f9b82aeaa7974dd6d2869 with SHA-1 5d530fab23 is already in history

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

Change-Id: Ib94b84432adf0bba69b298c267b19e14fae0dc80
 2021-03-19 02:51:11 +00:00
Amit Mahajan
058270b9a6 [automerger skipped] Merge "Clarifying documentation for SliceInfo per API council feedback." am: afb77c6f83 am: ddc8641c01 am: f36b5ff898 -s ours 
am skip reason: skipped by user reminv

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

Change-Id: I2c914d5d25c3cb544a1d4a810af9c44bb1b8f60f
 2021-03-19 02:50:46 +00:00
Lee Shombert
561400372c Merge "Move PM cache invalidate inside mlock" into sc-dev 2021-03-19 02:46:36 +00:00
Amit Mahajan
265c424758 Merge "Clarifying documentation for SliceInfo per API council feedback." into sc-dev am: 69ef020c8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13903213

Change-Id: Id8479b683bd6cb20a6b8d64fb207cb9701d70e9e
 2021-03-19 02:46:14 +00:00
Amit Mahajan
69ef020c8e Merge "Clarifying documentation for SliceInfo per API council feedback." into sc-dev 2021-03-19 02:32:35 +00:00
Chilun Huang
0404d3ee9b Merge "Do not use obsoleted snapshot as staring window" into sc-dev am: df8f101244 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824388

Change-Id: Ia5aaf083bf4f2ee8751233eb231d588405171ce3
 2021-03-19 02:26:50 +00:00
Wilson Wu
5dd9bdee40 Merge "Introduce InputMethodSessionWrapper for InputMethodManager" into sc-dev am: 69a14b8a8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13838646

Change-Id: I16f868a8dc32a25eec96a9a5d0d51cd9105eaca0
 2021-03-19 02:26:37 +00:00
Chilun Huang
df8f101244 Merge "Do not use obsoleted snapshot as staring window" into sc-dev 2021-03-19 02:07:48 +00:00
Wilson Wu
69a14b8a8e Merge "Introduce InputMethodSessionWrapper for InputMethodManager" into sc-dev 2021-03-19 02:05:02 +00:00
Wilson Wu
17827d754a Introduce InputMethodSessionWrapper for InputMethodManager 
To simplify InputMethodManager code logic, have a wrapper
class which encapsulates IPCs from InputMethodManager to
InputMethodService.

Bug: 167948374
Test: atest CtsInputMethodTestCases

Change-Id: Ifb4f86098011fe74cf4159446106d6c15c30fa30
 2021-03-19 09:50:42 +08:00
SongFerng Wang
c1f7e65041 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev am: 026fa948ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13835347

Change-Id: I24b8cf474b9a81265495a02fe70a85b4c0e5a1fe
 2021-03-19 01:49:29 +00:00
Daniel Huang
d830a0620e Merge "Add configs for IMS Service Entitlement." into sc-dev am: 408440ed54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13738525

Change-Id: Ifea262e375dde5c07fd2af2204b7890f5c56d9a0
 2021-03-19 01:48:47 +00:00
TreeHugger Robot
28b34b3a87 Merge "[incfs] Use the new libincfs API for file status checking" into sc-dev am: 3c05313b04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13922016

Change-Id: I1a2477f3856eb65768825818f5a7fbd89638f57d
 2021-03-19 01:47:54 +00:00
TreeHugger Robot
55de27b3b7 Merge "Add the intent to navigate to MANAGE_MEDIA permission page" into sc-dev am: b50b960b35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824706

Change-Id: I2ec5997485ddbde14a42db6ab616659f71d34b0a
 2021-03-19 01:47:24 +00:00
SongFerng Wang
026fa948ae Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev 2021-03-19 01:28:31 +00:00
Daniel Huang
408440ed54 Merge "Add configs for IMS Service Entitlement." into sc-dev 2021-03-19 01:22:57 +00:00
TreeHugger Robot
3c05313b04 Merge "[incfs] Use the new libincfs API for file status checking" into sc-dev 2021-03-19 01:19:05 +00:00
Treehugger Robot
6f06dae1c3 Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146

Change-Id: Ibf882ed499ada52633ce22b88c1af931f9064ce3
 2021-03-19 01:08:39 +00:00
TreeHugger Robot
b50b960b35 Merge "Add the intent to navigate to MANAGE_MEDIA permission page" into sc-dev 2021-03-19 01:00:40 +00:00
Peiyong Lin
e79a8decce Merge "Add 90% downscale factors." into sc-dev am: c28c4ff016 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13878166

Change-Id: Ieb96ae5945051ef1c1f7eedf20a35d6413832608
 2021-03-19 00:34:01 +00:00
Jorge Gil
b0d9be7fbd Merge "Update the PIP exclusion bounds when PIP is offset by shelf/ime" into sc-dev am: f134ef3656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13879996

Change-Id: I1f0da56fcaf0b9fc4503d5fd3754e8887d1f7975
 2021-03-19 00:33:27 +00:00
Jeff DeCew
192cb3a21b Merge "Fix an likely ClassCastException in Notification.visitUris" into sc-dev am: a84cafdd58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13901745

Change-Id: Ib68e272b942659bf48f8473fb6e7f3d65bcbe01f
 2021-03-19 00:32:49 +00:00
Treehugger Robot
1ade004e0f Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146

Change-Id: Id4280de7e3f6f6693e0d03c901f4e9665803b92b
 2021-03-19 00:31:59 +00:00
Peiyong Lin
c28c4ff016 Merge "Add 90% downscale factors." into sc-dev 2021-03-19 00:29:13 +00:00
Jorge Gil
f134ef3656 Merge "Update the PIP exclusion bounds when PIP is offset by shelf/ime" into sc-dev 2021-03-19 00:12:19 +00:00
Jeff DeCew
a84cafdd58 Merge "Fix an likely ClassCastException in Notification.visitUris" into sc-dev 2021-03-19 00:11:32 +00:00
Jeff Sharkey
e200247dad Merge "Add flags to <uses-permission> manifest tags." into sc-dev am: d8a9a21a84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13844192

Change-Id: I13039f170b55e8daef44f6f67425b532b783f15e
 2021-03-19 00:10:19 +00:00
TreeHugger Robot
c8c7e696bd Merge "Fix a bug in RuleIndexingController where StackOverflowError occurs" into sc-dev am: 065b6513ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743003

Change-Id: I82ba2a1088f5c8b2718e8cf7ca002e32383101af
 2021-03-19 00:10:02 +00:00
Shuzhen Wang
307180a14a Merge "Camera: Fix a doc typo" into sc-dev am: 6001ff0cd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921466

Change-Id: I45ca4878d8401fe86a0e4954f6a77bf4dfe760de
 2021-03-19 00:09:44 +00:00
TreeHugger Robot
1e24dab1cf Merge "Fix and re-enable BatteryStatsCpuTimesTest" into sc-dev am: 3f6e6e2ef8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13909758

Change-Id: Idf8ccf955f252dc47a91b04d3b84c961ea369fd9
 2021-03-19 00:09:21 +00:00
Kevin Chyn
9f8ed88855 Merge "Add BiometricPrompt.Builder#setAllowedSensorIds TestApi" into sc-dev am: be59c0b015 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13911582

Change-Id: I8f2ad3f678af159ae2a62259cbf5a2d365efc0c2
 2021-03-19 00:08:00 +00:00
Jeff Sharkey
d8a9a21a84 Merge "Add flags to <uses-permission> manifest tags." into sc-dev 2021-03-19 00:06:12 +00:00
TreeHugger Robot
065b6513ee Merge "Fix a bug in RuleIndexingController where StackOverflowError occurs" into sc-dev 2021-03-19 00:05:18 +00:00
Amit Mahajan
1ee17465ec Clarifying documentation for SliceInfo per API council feedback. 
Test: none; documentation only change
Bug: 180125761
Change-Id: Ic26598802d0648e7a12ed0ec78c01afc1a72598f
 2021-03-18 16:59:45 -07:00
Shuzhen Wang
6001ff0cd1 Merge "Camera: Fix a doc typo" into sc-dev 2021-03-18 23:59:21 +00:00
TreeHugger Robot
3f6e6e2ef8 Merge "Fix and re-enable BatteryStatsCpuTimesTest" into sc-dev 2021-03-18 23:56:00 +00:00
Kevin Chyn
be59c0b015 Merge "Add BiometricPrompt.Builder#setAllowedSensorIds TestApi" into sc-dev 2021-03-18 23:55:00 +00:00
Hajime Morrita
758349ad75 Merge "Remove pin_split_apks flag" into sc-dev am: 34385615dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13879546

Change-Id: I3ec309372f818656ad3ff061fb0a3c5a0b20eae7
 2021-03-18 23:48:56 +00:00
Treehugger Robot
be1b1d5550 Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." 2021-03-18 23:46:37 +00:00
TreeHugger Robot
ed22bb1049 Merge "Switch over RemoteCallbackList to handle callbacks." into sc-dev am: 6bd3e2ad64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13882006

Change-Id: I09ac25e54d34a4542b98f99a811892ebea5e8086
 2021-03-18 23:45:19 +00:00
Hajime Morrita
34385615dd Merge "Remove pin_split_apks flag" into sc-dev 2021-03-18 23:39:24 +00:00
TreeHugger Robot
6bd3e2ad64 Merge "Switch over RemoteCallbackList to handle callbacks." into sc-dev 2021-03-18 23:27:52 +00:00
Evan Rosky
5d3b5f70c7 Merge "Initial support for display rotation in shell transitions" into sc-dev am: 557bab6f87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13538094

Change-Id: I5ec9639c906c016d01ecd994fcce4ee2d2db039f
 2021-03-18 23:27:22 +00:00