Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
647,776 Commits 3 Branches 0 Tags
c18405773105eccdb57122baf2791236b6ec68ed
Commit Graph

647776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c184057731 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71340676efc68296a67411057ea86b95e89dcfd7
 2021-08-13 22:52:07 +00:00
TreeHugger Robot
ee6d526833 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e9ee255d315af28a22e342e8f345cb32bf715a4
 2021-08-13 22:51:44 +00:00
TreeHugger Robot
dba5e43aeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6a9d7e4e52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d442f3bef43821e54415c8a0e4742eee8415c7a
 2021-08-13 22:44:26 +00:00
TreeHugger Robot
7a4321c576 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 22:31:22 +00:00
TreeHugger Robot
7eba26bb3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98af4dbe78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I731401ab3156299f9ac66b68859cb8c975c08ebf
 2021-08-13 22:22:50 +00:00
Automerger Merge Worker
3c65d955f6 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours" into sc-dev 2021-08-13 22:22:44 +00:00
TreeHugger Robot
529fcbe929 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib855e51c8126848e0478190c119914898a06bd05
 2021-08-13 22:22:31 +00:00
Max Bires
7447381921 Merge "Fixing a condition that can cause deadlock" into sc-dev 2021-08-13 22:22:30 +00:00
TreeHugger Robot
93800f9c89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 035381f8e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16c9394998f8febad8d6f3d48840367743fa5ff4
 2021-08-13 22:22:16 +00:00
TreeHugger Robot
7acc815b8e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 22:22:06 +00:00
TreeHugger Robot
6a9d7e4e52 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 22:18:55 +00:00
TreeHugger Robot
98af4dbe78 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 22:13:16 +00:00
TreeHugger Robot
efedfa2365 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 22:08:36 +00:00
TreeHugger Robot
035381f8e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 22:06:54 +00:00
TreeHugger Robot
25437b0452 Merge "Remove managed profile icon from QSBH" into sc-dev 2021-08-13 22:06:15 +00:00
TreeHugger Robot
f7fb6c535e Merge "Fix OOB crash in ContentCapture for translated views" into sc-dev 2021-08-13 21:59:25 +00:00
Bill Yi
fbd4d23c91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 385c28b337 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6683f40d46cfc0612348e653f057c8f20f97716
 2021-08-13 21:47:35 +00:00
Sudheer Shanka
cce33c3589 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 5833c655f9 -s ours 
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I0c16d851fc0703c277bb691db84d58f295590a66
 2021-08-13 21:46:34 +00:00
Bill Yi
6290323933 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 015f5f4ac2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9232f7a783c25bcf8a31fa5c57f6fea1953249e6
 2021-08-13 21:32:43 +00:00
TreeHugger Robot
a40e2a39bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8f1cf56b89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72b983f945aacb7c7f9977b9c38daa2c54af0680
 2021-08-13 21:32:19 +00:00
TreeHugger Robot
6d78431b3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 96a6987826 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14d21a7a622be2b789f97e58193177dbae567829
 2021-08-13 21:32:05 +00:00
TreeHugger Robot
28d546f8a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: dd5832d8e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf556e20853336c893524d0e94989e1d231fd6eb
 2021-08-13 21:31:27 +00:00
TreeHugger Robot
65d427c1b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 50fcaffe22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1e8e48d53066173e9df352085d6316544034a9d
 2021-08-13 21:31:11 +00:00
TreeHugger Robot
fa0563d581 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 04c8164ada -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic85991ba5d94e87096e7e892eccaa559bc8bccf0
 2021-08-13 21:30:55 +00:00
TreeHugger Robot
6f21cc649e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 277d17849c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ba3e3797d358c396db60f9900dee35a06de926b
 2021-08-13 21:29:59 +00:00
Sudheer Shanka
8502712492 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 0ce17cddf9 -s ours 
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I19bf066c87ecc3f59496f10642d139748ed33506
 2021-08-13 21:29:46 +00:00
Lucas Lin
0d88bdece9 [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -s ours 
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: Ic93e47714ceab7d01630c4ce5026fd169b3fd12e
 2021-08-13 21:29:20 +00:00
Lucas Lin
ba72ebb1ea [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -s ours 
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: I98276ee1deb0f0e501c66e73e5988c10bf6178e3
 2021-08-13 21:28:24 +00:00
TreeHugger Robot
6ce7011395 Merge "Auth ripple updates" into sc-dev 2021-08-13 20:41:18 +00:00
Xin Li
30a1c99c1b Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev 2021-08-13 20:38:50 +00:00
Fabian Kozynski
1c78531922 Remove managed profile icon from QSBH 
This adds it to the ignored icons in QuickStatusBarHeaderController
iconContainer.

Test: manual, create managed profile, icon doesn't show.
Fixes: 196243622
Change-Id: Ib97b9d947318b09d289076c63995327d356cb5fc
 2021-08-13 15:50:51 -04:00
Beverly
7d8bf678f4 Auth ripple updates 
* update the interpolator for the auth ripple so that it feels faster
* start the light reveal to be slightly ahead of the ripple
* increase radius size so the ripple isn't cutoff

Fixes: 196006323
Test: manual on sunfish and raven
Change-Id: Id2277b113e1241a21d5e98c9288fea27f0474115
 2021-08-13 19:03:12 +00:00
Joshua Mccloskey
f5704ec276 Merge "Destroy() client after onClientFinished." into sc-dev 2021-08-13 18:49:32 +00:00
Neha Jain
b3deaf2b6d Merge "Limit keyguard views on alt displays" into sc-dev 2021-08-13 18:45:32 +00:00
Alec Mouri
b0766d70d9 Merge "Remove bitwise plane information from ImageFormat's P010 docs" into sc-dev 2021-08-13 18:42:57 +00:00
TreeHugger Robot
f5557f625c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:37:20 +00:00
Xin Li
926d9c8f8c Merge stage-aosp-sc-ts-dev before making it an upstream 
Bug: 169893837
Merged-In: I35aae96e4ebb0c13bc567bb926f2e7a549f554ba
Change-Id: I5eb0e93b01f1bdc95df250f5cf94b597ccc1d42f
 2021-08-13 18:25:08 +00:00
TreeHugger Robot
7949cf90ac Merge "Camera: Initialize the forward processor along with the repeating pipeline" into sc-dev 2021-08-13 17:29:14 +00:00
Jayant Chowdhary
115b62decc Merge "camera2: Documentation updates for ultra high resolution sensors." into sc-dev 2021-08-13 17:11:23 +00:00
TreeHugger Robot
1ce567e28f Merge "Camera: Return sequence id for advanced extension requests" into sc-dev 2021-08-13 17:09:56 +00:00
Max Bires
9b1e1c4c08 Fixing a condition that can cause deadlock 
Callbacks on ServiceConnection happen on the main UI thread for an
application. Since the thread that calls bindService then immediately
blocks to wait for the service to be connected, this will cause a
deadlock if key operations are happening on the main UI thread.

This bug has likely not been detected yet since key operations are not
supposed to be performed on the main UI thread, however it was uncovered
in a similar application during other testing. This fix ensures the
ServiceConnection object's callbacks will be triggered from a separate
thread from the calling thread.

Bug: 196571032
Test: Apps that run key operations on the UI thread don't hang.
Change-Id: I630a0ef2560a8ebd962de54c65e3d6277133a1cb
 2021-08-13 08:59:29 -07:00
Philip Junker
c20398b8d1 Merge "Disallow usb access to camera and mic devices if global privacy toggle is active" into sc-dev 2021-08-13 13:49:37 +00:00
Jeff Sharkey
01034e6e61 Merge "Register IBluetoothManagerCallback per-process." into sc-dev 2021-08-13 12:54:27 +00:00
TreeHugger Robot
b1c1ae9517 Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev 2021-08-13 02:34:36 +00:00
Bill Yi
75d8c094f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I356404526378505c5c9cce4d14cb343b19b4f4d6
 2021-08-13 02:30:36 +00:00
Bill Yi
015f5f4ac2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e747b5f59524fd0824663d58a6645b5e3abb339
 2021-08-13 02:19:53 +00:00
Bill Yi
385c28b337 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idb57776f61dc6d4b2862b082fdd96cc8ab0107d0
 2021-08-13 02:12:49 +00:00
Yu-Ta Lu
9c219f140f Merge "Replace private attributes with public resources." into sc-dev 2021-08-13 00:32:04 +00:00
Joe Bolinger
afe9dad1da Merge "Remove new task flag when launching unicorn enrollment." into sc-dev 2021-08-12 22:57:38 +00:00
The Android Open Source Project
1606b7d3c7 Merge ab/7633965 
Bug: 169893837
Merged-In: I3ef19b77bc33546a3e80bca75532d017b4712054
Change-Id: I595fb801f4519177825f3fdc0021fb874a36aa31
 2021-08-12 22:30:48 +00:00