Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
644,633 Commits 3 Branches 0 Tags
2668ade547fd01062ae9f065c19dfea0441f4d72
Commit Graph

644633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerry Chang
2668ade547 Merge "Prevent rendering divider bar into wrong orientation" into sc-v2-dev am: 85c712a6ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703484

Change-Id: Ie77908c13e56204e88b83c4df2dfab8944ef232d
 2021-05-25 05:26:39 +00:00
Jerry Chang
85c712a6ba Merge "Prevent rendering divider bar into wrong orientation" into sc-v2-dev 2021-05-25 05:19:47 +00:00
Jerry Chang
562b85b6ad Merge "Fix broken layout after switched stage positions" into sc-v2-dev am: 3c96d58450 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14700832

Change-Id: Ic2c635dc8267270e78759f0eddea05be0499704d
 2021-05-25 05:11:33 +00:00
Joe Bolinger
aa54db0f35 Merge "Fix biometric tests that relied on a non-zero error reset delay." into sc-dev am: 72104bdf67 am: 3134c919c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14705316

Change-Id: I3e9addc905cbe722a66006900f152006df160bb8
 2021-05-25 05:11:25 +00:00
Jerry Chang
3c96d58450 Merge "Fix broken layout after switched stage positions" into sc-v2-dev 2021-05-25 05:11:23 +00:00
Joe Bolinger
297969f6fb Merge "Revert "Temporarily disable test."" into sc-dev am: cbc8bae156 am: 934dc7e820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703966

Change-Id: Ib13cf480e0a5148347252eb127ec74bec1a6ff2d
 2021-05-25 05:11:22 +00:00
TreeHugger Robot
48fedb536f Merge "BatteryStatsService: Increase max power stats size" into sc-dev am: 1be708acab am: 9ff32c322a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14191071

Change-Id: I38ade7232a1663bdb11d4f6638ec2d599db413ce
 2021-05-25 05:11:06 +00:00
Howard Chen
41e0160d8b [automerger skipped] Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" into sc-dev am: 8199b2b1d3 am: 7bf46f89dd -s ours 
am skip reason: Merged-In Ib60c68e3e91a4f0a7fd4e86b462091995bbe4fe2 with SHA-1 6be69d8f3b is already in history

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

Change-Id: I09c1fc75a2189b4010cc92daf35b3f85bfc7c205
 2021-05-25 05:10:21 +00:00
Joe Bolinger
3134c919c4 Merge "Fix biometric tests that relied on a non-zero error reset delay." into sc-dev am: 72104bdf67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14705316

Change-Id: Iee009640d30b829631ea93a377f561c90b42439e
 2021-05-25 04:49:56 +00:00
Joe Bolinger
934dc7e820 Merge "Revert "Temporarily disable test."" into sc-dev am: cbc8bae156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703966

Change-Id: I615478ddc34667adb4ebf0a96b1d621bde057953
 2021-05-25 04:49:54 +00:00
TreeHugger Robot
9ff32c322a Merge "BatteryStatsService: Increase max power stats size" into sc-dev am: 1be708acab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14191071

Change-Id: I6342eb11b5977c22c37d00935bc51d852a24915a
 2021-05-25 04:48:34 +00:00
Howard Chen
7bf46f89dd Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" into sc-dev am: 8199b2b1d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640276

Change-Id: Idf636265ba70eab8720c54a7db014270e53e8f7e
 2021-05-25 04:48:17 +00:00
Joe Bolinger
72104bdf67 Merge "Fix biometric tests that relied on a non-zero error reset delay." into sc-dev 2021-05-25 04:41:50 +00:00
Joe Bolinger
cbc8bae156 Merge "Revert "Temporarily disable test."" into sc-dev 2021-05-25 04:41:50 +00:00
TreeHugger Robot
1be708acab Merge "BatteryStatsService: Increase max power stats size" into sc-dev 2021-05-25 04:33:34 +00:00
Howard Chen
8199b2b1d3 Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" into sc-dev 2021-05-25 04:23:43 +00:00
TreeHugger Robot
9b46c840cc Merge "Update javadoc for ACTION_VIEW_PERMISSION_USAGE" into sc-dev am: 09a4771708 am: e73847fd8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14704249

Change-Id: Ia446659d3a57b95c1f24606f943d883a80c6cf9b
 2021-05-25 04:23:24 +00:00
Rhed Jao
c481b3c657 Merge "Enforce package visibility filter on the SharedLibraryInfo" into sc-dev am: dc61ccec60 am: 4d7db289bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14661878

Change-Id: Iffc40698507264eb81c787c8b51e957d2b344c2f
 2021-05-25 04:23:14 +00:00
Joe Bolinger
65cc066446 Merge "Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)" into sc-dev am: c584a39e67 am: f841c1086c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637111

Change-Id: Ib001a487ed1cac08c425f595d283b9b988d88308
 2021-05-25 04:22:34 +00:00
Treehugger Robot
f90c022d93 [automerger skipped] Merge "Should not try IMS or EMERGENCY APN for initial-attach." am: df7fddd96e am: 48bd481559 -s ours am: 4120a8bd82 -s ours 
am skip reason: Merged-In Ic5e449e514a996f90b815e56fe136ac1f453496e with SHA-1 77f9e2adfc is already in history

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

Change-Id: Iec3784f6b994e89f404e7f3dc7db518ad9df6e0b
 2021-05-25 04:15:32 +00:00
TreeHugger Robot
e73847fd8b Merge "Update javadoc for ACTION_VIEW_PERMISSION_USAGE" into sc-dev am: 09a4771708 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14704249

Change-Id: I28d6ac7fc488077a67bd94b1f51e43a716be81ce
 2021-05-25 04:02:45 +00:00
Rhed Jao
4d7db289bf Merge "Enforce package visibility filter on the SharedLibraryInfo" into sc-dev am: dc61ccec60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14661878

Change-Id: I08954f4e320c767343145395dae758cb3b22df6d
 2021-05-25 04:02:01 +00:00
Joe Bolinger
f841c1086c Merge "Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)" into sc-dev am: c584a39e67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637111

Change-Id: I1052dc3159da15426693340be915e1ec86bba474
 2021-05-25 03:59:45 +00:00
Treehugger Robot
4120a8bd82 [automerger skipped] Merge "Should not try IMS or EMERGENCY APN for initial-attach." am: df7fddd96e am: 48bd481559 -s ours 
am skip reason: Merged-In Ic5e449e514a996f90b815e56fe136ac1f453496e with SHA-1 77f9e2adfc is already in history

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

Change-Id: I786b1afd0c0e672c74505970d141a4a13464353d
 2021-05-25 03:49:51 +00:00
TreeHugger Robot
09a4771708 Merge "Update javadoc for ACTION_VIEW_PERMISSION_USAGE" into sc-dev 2021-05-25 03:17:56 +00:00
Rhed Jao
dc61ccec60 Merge "Enforce package visibility filter on the SharedLibraryInfo" into sc-dev 2021-05-25 03:14:55 +00:00
Joe Bolinger
c584a39e67 Merge "Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)" into sc-dev 2021-05-25 03:08:53 +00:00
Treehugger Robot
48bd481559 Merge "Should not try IMS or EMERGENCY APN for initial-attach." am: df7fddd96e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709709

Change-Id: I910096cd8a62ed6d8afde79fc166037db5319810
 2021-05-25 03:06:22 +00:00
Treehugger Robot
df7fddd96e Merge "Should not try IMS or EMERGENCY APN for initial-attach." 2021-05-25 02:48:51 +00:00
Howard Chen
6e6da13a0f Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" am: af5c516b49 am: 26bad177d3 am: fd89f0cf17 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710289

Change-Id: I3b4e70f5dce90cb213a8c95a47f42e30d7d4eefc
 2021-05-25 02:35:39 +00:00
Lucas Dupin
39dc0c805c Merge "Tweak notification scrim easing" into sc-dev am: 89b92e20eb am: 82cef4942f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703953

Change-Id: I550c2f77c675f5062aafa8f861fc70b3d923d0c5
 2021-05-25 02:34:22 +00:00
Lucas Dupin
82cef4942f Merge "Tweak notification scrim easing" into sc-dev am: 89b92e20eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703953

Change-Id: I509e3047e0e198734cd90996001bdacfdace54cd
 2021-05-25 02:18:35 +00:00
Howard Chen
fd89f0cf17 Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" am: af5c516b49 am: 26bad177d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710289

Change-Id: I1353b58528ed80e56b11259c94dce7397aac09bd
 2021-05-25 02:17:35 +00:00
Howard Chen
eed1312a77 Corrupt the PersistentDataBlock payload explicitly in factory reset 
The current formatPartitionLocked only sets the data length to zero and
leave the payload unchanged. If the client side ignores the header and
read the payload directly, it still has the chance to read old data.
This CL corrupts the payload explicitly in formatPartitionLocked.

Bug: 185369514
Test: \
  1. Flash device, wipe
  2. Go through SUW with a google account. Set a PIN.
  3. Factory Reset through Settings.
  4. In SUW, when setting up an account (or copy from an old device),
     it should not ask for the previous PIN.

Merged-In: Ib60c68e3e91a4f0a7fd4e86b462091995bbe4fe2
Change-Id: Ib60c68e3e91a4f0a7fd4e86b462091995bbe4fe2
 2021-05-25 02:01:17 +00:00
Lucas Dupin
89b92e20eb Merge "Tweak notification scrim easing" into sc-dev 2021-05-25 01:58:23 +00:00
Howard Chen
26bad177d3 Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" am: af5c516b49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710289

Change-Id: Ic2caf36348295c5075bfef46e3b3c113daf75930
 2021-05-25 01:58:00 +00:00
Howard Chen
af5c516b49 Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" 2021-05-25 01:43:25 +00:00
Minche Li
941937ee87 Merge "Assigns the default value of the cache magnification mode" into sc-dev am: d772c72acb am: fc42ac85d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671952

Change-Id: Ibea66c9def40f76f71da699c24b209447be91af5
 2021-05-25 01:05:06 +00:00
Erik Wolsheimer
2c07336634 Merge "Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD" into sc-dev am: af00dc9264 am: 1c0a2f03e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14707023

Change-Id: Ibe7588e9cd24bf6a437a33bf1fc57f5b9b1ff8cf
 2021-05-25 01:04:50 +00:00
Remi NGUYEN VAN
5ce1a732e8 [automerger skipped] Merge "Remove packages/Connectivity" am: 996ae3fb4d am: b0927a02f3 -s ours am: c2742b7293 -s ours 
am skip reason: Merged-In I2ed1fb00a7780c488c40d27590f206031fe033f2 with SHA-1 f69a7d09e1 is already in history

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

Change-Id: Id6b80dddf069bad7fe482a3f0c4b8b68648e0be4
 2021-05-25 00:42:04 +00:00
Minche Li
fc42ac85d8 Merge "Assigns the default value of the cache magnification mode" into sc-dev am: d772c72acb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14671952

Change-Id: Ia7af75f25cd265e3fbb2ee222f58eb7bfe964d15
 2021-05-25 00:41:54 +00:00
Erik Wolsheimer
1c0a2f03e7 Merge "Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD" into sc-dev am: af00dc9264 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14707023

Change-Id: Ic3b0cb8491675620cb69cee70d71f2fb76fcc5e2
 2021-05-25 00:41:41 +00:00
Minche Li
d772c72acb Merge "Assigns the default value of the cache magnification mode" into sc-dev 2021-05-25 00:38:28 +00:00
Guojing Yuan
5a67ef6b76 Update javadoc for ACTION_VIEW_PERMISSION_USAGE 
Bug: 176902658

Test: N/A
Change-Id: Ic4928fed75ad986c13af704d13985602ba972553
 2021-05-25 00:27:01 +00:00
Erik Wolsheimer
af00dc9264 Merge "Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD" into sc-dev 2021-05-25 00:24:18 +00:00
Erik Wolsheimer
350fa3e8b0 Describe time base/units on ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD 
Bug: 188084977
Test: NA
Change-Id: I25aa1d6419cdec8f0a9508948451be9edbffa964
 2021-05-24 17:20:06 -07:00
Remi NGUYEN VAN
c2742b7293 [automerger skipped] Merge "Remove packages/Connectivity" am: 996ae3fb4d am: b0927a02f3 -s ours 
am skip reason: Merged-In I2a7a181e65be8952f8044df845efa80b6134d416 with SHA-1 d65474f3e4 is already in history

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

Change-Id: I521b48745e5f2427c7afddaebce22048723ff2b3
 2021-05-25 00:18:04 +00:00
Remi NGUYEN VAN
b0927a02f3 Merge "Remove packages/Connectivity" am: 996ae3fb4d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715469

Change-Id: I281a44b35b60e630128b103457d53a314534ae16
 2021-05-24 23:57:27 +00:00
Remi NGUYEN VAN
996ae3fb4d Merge "Remove packages/Connectivity" 2021-05-24 23:32:43 +00:00
Christian Wailes
a99731721e [automerger skipped] Merge "RESTRICT AUTOMERGE: Revert "Register ART Service with the System Server"" into sc-dev am: 4a99888888 -s ours am: 6a40747ffc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14629766

Change-Id: Id0041c2d3489487723d409a63d3e837fc0f20add
 2021-05-24 23:29:27 +00:00