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

634966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Pietal
d4420de0cd Revert^4 "Enable smartspace" 
20744ed3b4

Change-Id: I1eba412c6cb31684760af068b86a602cf6a53578
 2021-04-10 06:51:42 -04:00
TreeHugger Robot
f163ffe1a3 Merge "Add keylayout mapping for Dualsense game controller." into sc-dev 2021-04-10 08:17:01 +00:00
TreeHugger Robot
e8131b4e13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ccaeb0f6c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0dbd0d31e53aee11d1d9a2c53c2e6fb127f7e608
 2021-04-10 07:37:17 +00:00
TreeHugger Robot
d984b05ec7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1ec8674378 -s ours am: 45e9470b7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba3f62ffdb078ec6feb674565367980fdb87e8dd
 2021-04-10 07:16:18 +00:00
TreeHugger Robot
45e9470b7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1ec8674378 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38bc33f51b6617bfdeb605a1b68f80eae7b84801
 2021-04-10 06:00:58 +00:00
TreeHugger Robot
ccaeb0f6c8 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 05:54:38 +00:00
TreeHugger Robot
d942e8c649 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 918aeb2e71 -s ours am: 3793f3ca23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8d7317cab0899bd49ad0b9191d33623abc51cff
 2021-04-10 05:25:55 +00:00
TreeHugger Robot
f4da93648e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fe45cc15b7 -s ours am: bd8e63545b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4385f1b085ee6fa94ddd41c3419218d1e8571451
 2021-04-10 05:25:42 +00:00
TreeHugger Robot
bbd84dfff4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f5693e6cdc -s ours am: 8dc1bc6cbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If959258019ead34e25536f745b688f990dd82e9a
 2021-04-10 05:25:28 +00:00
TreeHugger Robot
77999ac695 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f8ecc90ea3 -s ours am: d49775ea4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9697943e89dc25f8b308d1517bc02c941c2b58ff
 2021-04-10 05:24:44 +00:00
TreeHugger Robot
1ec8674378 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 05:13:06 +00:00
TreeHugger Robot
b5e420af8b Merge "Revert^2 Initial data pipeline for Smartspace media recommendations data in media carousel." into sc-dev 2021-04-10 05:06:38 +00:00
TreeHugger Robot
3793f3ca23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 918aeb2e71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1066ff25ccd377f64f6351b24cf1c306fb8a2cc4
 2021-04-10 04:33:40 +00:00
TreeHugger Robot
bd8e63545b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fe45cc15b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35efdc93b0163b48e72c2c76ad04127b7700c326
 2021-04-10 04:33:31 +00:00
TreeHugger Robot
8dc1bc6cbc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f5693e6cdc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f0334c24dc2342ddcd2e52c8c3a4965aa924b77
 2021-04-10 04:33:15 +00:00
TreeHugger Robot
d49775ea4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f8ecc90ea3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a3a0e7d86676ec0deec870bde4a51057622cef9
 2021-04-10 04:33:03 +00:00
TreeHugger Robot
badb432a45 Merge "Update Reference RCU kl and idc files" into sc-dev 2021-04-10 04:16:25 +00:00
Shan Huang
4e784c87b1 Merge "Remove text and animated dots on wireless charging animation." into sc-dev 2021-04-10 04:08:39 +00:00
TreeHugger Robot
918aeb2e71 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 03:57:04 +00:00
TreeHugger Robot
fe45cc15b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 03:55:04 +00:00
TreeHugger Robot
f5693e6cdc Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 03:54:48 +00:00
TreeHugger Robot
f8ecc90ea3 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-10 03:51:49 +00:00
Bill Yi
579e127fcc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3fea20a6505394081e9a89ba6d09d5b4f52061b3
 2021-04-09 19:40:24 -07:00
Cecilia Hong
d8dd3010d4 Revert^2 Initial data pipeline for Smartspace media recommendations data in media carousel. 
This reverts commit 1967209719.

Reason for revert: Forward fix with removing the bcsmartspace dependency.

Test: Tested manually on local builds
Bug: 182813345
Change-Id: Icb8cbac4e27abfa9346f9ed0ef6513f6874db556
 2021-04-10 02:07:17 +00:00
Wei Wang
cc2602452b Merge "Revert "Update face detectInteraction"" into sc-dev 2021-04-10 01:45:35 +00:00
TreeHugger Robot
c6970005ea Merge "DejankUtils fix for wrong thread init" into sc-dev 2021-04-10 01:04:21 +00:00
Bill Yi
475b98c5ad Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f7d3930b3e8cab9b99fc7344999ad4923beefd6
 2021-04-09 18:02:49 -07:00
Bill Yi
11ef406ebe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6b37a09419127e9d0666775a2df2290e992f2c04
 2021-04-09 17:36:15 -07:00
Lucas Dupin
298971dba9 Merge "Add namespace to lStar" into sc-dev 2021-04-10 00:31:21 +00:00
Kevin Chyn
2a4f86bea0 Revert "Update face detectInteraction" 
This reverts commit 5b0dd45ad8.

Reason for revert: b/184978217?

Change-Id: Ie92632f0373376f238eac5638aba71a1a31abdcf
 2021-04-10 00:21:54 +00:00
Bill Yi
6e0ed00793 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21fd5ec5f45fb3c51d161a6844b2769ad941cbdd
 2021-04-09 17:09:50 -07:00
TreeHugger Robot
8f82ab8f05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 603bcc5fb0 -s ours am: eab0913ac3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59d03e4422c30b33d199c7a7d314dae6b1693171
 2021-04-10 00:08:05 +00:00
Tianjie Xu
61647a6979 Merge "Expose error code for RoR reboot system API" am: d5547af728 am: 2cf5387b09 am: 133568e964 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1656644

Change-Id: I9cda23318ea0cab9c2e37e7a5967bed81a3188c7
 2021-04-10 00:07:51 +00:00
Brad Ebinger
5d26ce4360 Merge "Rename closeDialog to cleanupSession" am: 0a99b6c48b am: 0eaa96b4e7 am: 6523cf73cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670485

Change-Id: Ibf58445e83e76ee13980ecd89d7919de676fd710
 2021-04-10 00:06:27 +00:00
Treehugger Robot
24875ce692 Merge "Retire ro.kernel.android.checkjni from AndroidRuntime.cpp" am: 25807e2f86 am: 5609c37a4f am: fcd90b1a1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670529

Change-Id: I350c527e1fe0a6badddddcfd150f97c7207c570c
 2021-04-10 00:05:23 +00:00
Bill Yi
630fc982a5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8c71134fd6252fd0c8d81dd3e32d278d88b1ecf3
 2021-04-09 16:43:37 -07:00
TreeHugger Robot
eab0913ac3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 603bcc5fb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifea9b277801f8e24ec5e9cc29f5e0abe8c21b08a
 2021-04-09 23:26:21 +00:00
Tianjie Xu
133568e964 Merge "Expose error code for RoR reboot system API" am: d5547af728 am: 2cf5387b09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1656644

Change-Id: I96d48a205fb1f2d3a6b353e2b2ea36383c20eb2f
 2021-04-09 23:26:15 +00:00
Rubin Xu
2c34160c28 Merge "Recognize numeric PIN in resetPasswordWithToken()" into sc-dev 2021-04-09 23:21:18 +00:00
TreeHugger Robot
603bcc5fb0 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-09 23:16:48 +00:00
Brad Ebinger
6523cf73cb Merge "Rename closeDialog to cleanupSession" am: 0a99b6c48b am: 0eaa96b4e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670485

Change-Id: I4d864c07103fccbe0f30035daafe8e14278576ac
 2021-04-09 23:00:28 +00:00
Treehugger Robot
fcd90b1a1b Merge "Retire ro.kernel.android.checkjni from AndroidRuntime.cpp" am: 25807e2f86 am: 5609c37a4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670529

Change-Id: Iad8b1d4e48dfb2f6984afcbc815d39da609260aa
 2021-04-09 23:00:06 +00:00
Tianjie Xu
2cf5387b09 Merge "Expose error code for RoR reboot system API" am: d5547af728 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1656644

Change-Id: I8a935bab40cbaa2b9fab9247478efdbd4654eb37
 2021-04-09 22:56:52 +00:00
Yi Jiang
d7b7e55d3d Merge "Grabs foreground activity's package name" into sc-dev 2021-04-09 22:55:10 +00:00
Bill Yi
8720c31b11 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I172cdfb0ed4821b126d6f3043b2ee3fb60a2b05c
 2021-04-09 15:50:55 -07:00
Brad Ebinger
0eaa96b4e7 Merge "Rename closeDialog to cleanupSession" am: 0a99b6c48b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670485

Change-Id: I4d7fe4a63ccb193e5ba103c4e07cd9d9342161d5
 2021-04-09 22:47:12 +00:00
TreeHugger Robot
d1c2b6298d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6aec468bff -s ours am: 4551493131 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2cab3f4cf53bff0160fe046667d2db001f73fa4
 2021-04-09 22:42:55 +00:00
TreeHugger Robot
dd0f13d85a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f777237523 -s ours am: c710b22dda -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81e602b67c7ce3b640b60c08b20e9e3c8b321914
 2021-04-09 22:42:40 +00:00
Treehugger Robot
5609c37a4f Merge "Retire ro.kernel.android.checkjni from AndroidRuntime.cpp" am: 25807e2f86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670529

Change-Id: Ie64ab2dbafb30a17851581d53b3ff8b8f6f45359
 2021-04-09 22:41:35 +00:00
Treehugger Robot
a1beb29ac3 [automerger skipped] Merge "Separate the emulator specific part of ClipboardService.java" am: ab750baa0c am: 3ab180a990 am: 6ac56f7355 -s ours 
am skip reason: skip tag Change-Id Icdb25d51437ba0f8e98a2750b0b705c15755f106 with SHA-1 b0705e062e is already in history

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

Change-Id: Iaade87a3c416b814cbcdbc3a6f740be256d8cdf7
 2021-04-09 22:41:35 +00:00