Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
659,839 Commits 3 Branches 0 Tags
00a442d67a3db91b12e53ee6b9f99da9d9a6d236
Commit Graph

659839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Bolinger
00a442d67a [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 am: c53247615d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b2c74777bf4bdce8f85e9d1b48f1188d951649b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 17:50:24 +00:00
Joe Bolinger
3b8fef3d48 [automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f8682f -s ours am: 5410ad42bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id36cf5a90a2a4fad6096f827a878669ae0499b34
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 17:50:10 +00:00
Joe Bolinger
c53247615d Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662

Change-Id: I9a9bf3b5f7ccdc1198c012e495cd42c55f51f296
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 17:14:50 +00:00
Joe Bolinger
5410ad42bc [automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f8682f -s ours 
am skip reason: skipped by user jbolinger

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

Change-Id: I076199e318c89af583c64a8bd66ec854719cc975
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 17:14:41 +00:00
Yunfan Chen
c0bcb303e8 Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into sc-v2-dev 2022-04-25 06:45:38 +00:00
Joe Bolinger
c0d3a87af0 [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54bf0eb100644ef2c8af8736fe8c0729e5b9c8e1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:16:25 +00:00
Joe Bolinger
1cf3ad5fc4 [automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: 8175c6a005 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbfb2ef0faa3a44be397d42c724d06c3d44fb31b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:16:20 +00:00
Joe Bolinger
5cdb1689bb Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev 2022-04-22 23:44:03 +00:00
Joe Bolinger
c8347811b2 Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev 2022-04-22 23:43:44 +00:00
Joe Bolinger
c7fdbcf15a Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-v2-dev 2022-04-22 19:17:10 +00:00
TreeHugger Robot
02523e8172 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-22 03:59:00 +00:00
TreeHugger Robot
ebfec6f0c5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-22 03:59:00 +00:00
TreeHugger Robot
a06c2e39a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-22 03:59:00 +00:00
TreeHugger Robot
0d34cd26a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-22 03:59:00 +00:00
TreeHugger Robot
321bc7cceb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-21 21:13:11 +00:00
TreeHugger Robot
793546f301 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-21 21:13:11 +00:00
TreeHugger Robot
17db7dfc1a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-21 21:13:11 +00:00
Bill Yi
c91b6268f7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id7ce6baf26516ae7232066852cb5a78c1c0a90e1
 2022-04-21 00:56:28 +00:00
Bill Yi
fc2e65f050 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7f59595158a97014d2411d71e3943118122fddef
 2022-04-21 00:35:29 +00:00
Bill Yi
9876532995 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ice41c54bf1f912706e56f64992243dc1bc9d180f
 2022-04-21 00:04:37 +00:00
Bill Yi
e80ceb5077 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I86a70bfe201db3c6f2dc9c2478cac6d61a65b222
 2022-04-20 23:58:17 +00:00
Eric Biggers
0be1e471f1 [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours am: 76ce5348f3 -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history

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

Change-Id: I9bbdb52e107c90eefc21caa666ebd8edca8dad4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:42:30 +00:00
Eric Biggers
2f6cc5bbee [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours am: f07b486484 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If08a28b9bb75749f42f2fda7625925332daf2c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:42:28 +00:00
Eric Biggers
5c7ad21e36 [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours am: fac1d6ed60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bf498235aa40a2b00b514a0c03aaeeb8c20eed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:42:23 +00:00
Eric Biggers
c86e05a909 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours am: 790a5e0467 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd239d213dc87e0e717010e4c251230b92ec5cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:42:21 +00:00
Eric Biggers
d8103629fc [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours am: 7b3aac9d05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3e5137a567c4180dc1454e541f3177096bc34a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:42:19 +00:00
Eric Biggers
c3fed9e116 [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours am: 3fea57d1ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I433ee45f7cc5a33eccd9a6a6aeac4b5db9d9e411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:42:16 +00:00
Eric Biggers
76ce5348f3 [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history

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

Change-Id: Ib5a6eb67de330e4250162773d805226d5b0c2657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:25:21 +00:00
Eric Biggers
f07b486484 [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8215414f6dcb9f8db9c8700060a1146a84e424c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:25:20 +00:00
Eric Biggers
fac1d6ed60 [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If74e1d1c0ecc7cca86595b006920151fc415311c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:25:08 +00:00
Eric Biggers
790a5e0467 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a8f1710e07b4ff76dfa868bfc2f968ff2d8c050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:25:06 +00:00
Eric Biggers
7b3aac9d05 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8dd0362b809bf701fd5118d7696d9a8da34a3bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:24:55 +00:00
Eric Biggers
3fea57d1ca [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie97795a07e668817f027aaadcbdafcbc1fbd7694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:24:49 +00:00
Bill Yi
7291bdbf8a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I29a1a5074c6a64a8830f4b251cc7c417da3c2b77
 2022-04-20 22:23:36 +00:00
Eric Biggers
ff2c282fb4 [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history

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

Change-Id: I647f13be357f4d5d19d2577210113c26324fb8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:01:01 +00:00
Eric Biggers
54a7bd48dc [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85a4346eec74128ae6e9b1bb99e3e96e43c50aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:53 +00:00
Eric Biggers
0f285346e5 [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I915cad24ff570c667508f9de0fef3e69c25df310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:46 +00:00
Eric Biggers
ef37c0da49 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I876562e133dec3532333cf684b95b4d282682bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:38 +00:00
Eric Biggers
39bf332aab [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba7aa9d2bbacce83e543d86e798615d2b3aa0625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:30 +00:00
Eric Biggers
a86355bfef [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0f7bb7babdcc795d81b597625de44e536ff252a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:24 +00:00
Eric Biggers
5526853e6d Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: Id5460b2d89d889f640893226e1cba232ce1ec0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:36 +00:00
Eric Biggers
4df21cf7ca [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: I534bf5bd4ab88aee8afb8d1bc8f6ab732e966e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:33 +00:00
Eric Biggers
be952611ed [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250

Change-Id: I9f47d7a36a6d3d6c1ba5b82d17f21c15dd9f7235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:31 +00:00
Eric Biggers
4eadb46170 [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249

Change-Id: I641bedd5939fe451bd7c478c2105a5a6652e7e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:28 +00:00
Eric Biggers
d685b63f1a [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248

Change-Id: Icbaf5892b2804757bc831533fbf2adf851f89f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:22 +00:00
Eric Biggers
ee88d1fd14 [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247

Change-Id: I034fc93d091ee1944a5487e58dd61605bc8e19ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:18 +00:00
Bill Yi
7eb67638df Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0b55e3dacc649e1e292c7da63ca4c748132078c5
 2022-04-20 21:15:52 +00:00
Eric Biggers
74c295ea08 Merge changes from topic "unencrypted-dirs-r" into rvc-dev 
* changes:
  [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure
  [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users
  [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only
  [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails
  [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage
 2022-04-20 21:12:39 +00:00
TreeHugger Robot
df7e8c7203 Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 856b62f907 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466

Change-Id: I986c3cd0cd5b52d7a57142721d44cd6734c42ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:04:37 +00:00
Eric Biggers
9d405365cf Ignore errors preparing user storage for existing users am: e667b60402 am: 1dd78739ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416119

Change-Id: Idfec03f3f90e2e5d49bf535ac5af068c7936308b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:04:21 +00:00