Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
641,871 Commits 3 Branches 0 Tags
e7fd299c0ae03efccc1001ba2033dc477877495f
Commit Graph

641871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhen Zhang
e7fd299c0a Merge "Rename API based on API review" into sc-dev am: c7c816a951 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14131577

Change-Id: I93d15f5f03bfe6d8fcdbe2f0342203e20ac93404
 2021-04-13 20:41:01 +00:00
Jorim Jaggi
41edbbf86d Merge "Change hwui jank detection to use deadline & gpu completion (1/2)" into sc-dev am: 21142c13de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13562070

Change-Id: If103b9233588dd21c007f608caac598350ef68bf
 2021-04-13 20:39:45 +00:00
TreeHugger Robot
63e35f3f60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b8a744543c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I071d42d925de32e0ba2565ee46a2ed6ba8c7a7ee
 2021-04-13 20:39:31 +00:00
John Reck
6a8b27b8c7 Merge "Remove CloseGuard from DisplayEventReceiver" into sc-dev am: 9f7e44d30d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174188

Change-Id: Ifcff1ec6c7d8ea3c36135861414bcc8b87504093
 2021-04-13 20:39:19 +00:00
Rob Carr
4fc301aa36 Merge "Remove deferTransactionUntil" into sc-dev am: 211bf19cca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855851

Change-Id: I93b36a40288478d4bcfb6aae60d351788fe0f17b
 2021-04-13 20:38:55 +00:00
Zhen Zhang
c7c816a951 Merge "Rename API based on API review" into sc-dev 2021-04-13 20:07:53 +00:00
Bill Yi
4e37ec7793 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-13 20:03:50 +00:00
Bill Yi
7162a783e5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-13 20:03:42 +00:00
Bill Yi
a31be06608 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-13 20:03:33 +00:00
Jorim Jaggi
21142c13de Merge "Change hwui jank detection to use deadline & gpu completion (1/2)" into sc-dev 2021-04-13 19:58:27 +00:00
TreeHugger Robot
b8a744543c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-13 19:55:35 +00:00
John Reck
9f7e44d30d Merge "Remove CloseGuard from DisplayEventReceiver" into sc-dev 2021-04-13 19:50:53 +00:00
Rob Carr
211bf19cca Merge "Remove deferTransactionUntil" into sc-dev 2021-04-13 19:47:24 +00:00
Jordan Liu
5b1524e620 Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 am: 79bd307a60 am: 5b6f3db2ab am: f8f0b73025 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663960

Change-Id: I794f9f921550bf5fd20481053ef5cb9bed360d5e
 2021-04-13 19:47:10 +00:00
Jordan Liu
f8f0b73025 Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 am: 79bd307a60 am: 5b6f3db2ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663960

Change-Id: Ie6f18d05799607a2a48ba38d1ff62ce4683e868e
 2021-04-13 19:32:09 +00:00
TreeHugger Robot
4a4810af0c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 51ba9b3e44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b422fbf06ac5e83c18c1c7f8ee743904ff8c516
 2021-04-13 19:28:47 +00:00
Siim Sammul
86a976801d [automerger skipped] Merge "Change BinderLatencyBuckets to use int[] instead of ArrayList to improve performance." into sc-dev am: 50ddece0e9 -s ours 
am skip reason: skip tag Change-Id Id996b52b5cb69a85f9c6a932ea8d30336fcaf12a with SHA-1 9d02e6101e is already in history

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

Change-Id: Ic210b58f8b8582f630b9166162d0851eff7bb4d9
 2021-04-13 19:28:35 +00:00
Lucas Dupin
5eb1184813 Merge "Allow first color event during SUW" into sc-dev am: b88361ef75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161880

Change-Id: I8caddee4734eb790bc98a7bd9763f6b3e79e0f40
 2021-04-13 19:28:24 +00:00
TreeHugger Robot
51ba9b3e44 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-13 19:28:07 +00:00
Siim Sammul
50ddece0e9 Merge "Change BinderLatencyBuckets to use int[] instead of ArrayList to improve performance." into sc-dev 2021-04-13 19:27:49 +00:00
TreeHugger Robot
4eab6ca7cf Merge "Use elapsed-time in AppTimeLimitController." into sc-dev am: 1ddf97e511 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14144546

Change-Id: I6c789b38875363e7accbefe013e0ff850036e816
 2021-04-13 19:27:45 +00:00
Lucas Dupin
b88361ef75 Merge "Allow first color event during SUW" into sc-dev 2021-04-13 19:25:33 +00:00
TreeHugger Robot
1ddf97e511 Merge "Use elapsed-time in AppTimeLimitController." into sc-dev 2021-04-13 19:09:40 +00:00
Danny Epstein
f8930a9337 Merge "Allow getComponentName() to be used in tests" into sc-dev am: 254953ec68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14098158

Change-Id: Iabc0bec1e3c18f7a128c3c7c9487c0d6ab7e0631
 2021-04-13 19:09:02 +00:00
Matt Pietal
fc4b20545d Merge "QS Wallet priority placement" into sc-dev am: 6ee6b37c2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14173207

Change-Id: I51e670fbeac60ed14e190410d75828386558e2a3
 2021-04-13 19:08:44 +00:00
Automerger Merge Worker
a36debe412 [automerger skipped] Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master am: 23c55673c6 am: 51bbfddd7d -s ours am: 025e7c2d26 -s ours 
am skip reason: skip tag Change-Id I94e2ecd2075a577c5362293622ce5be5167cd91a with SHA-1 7f3393d849 is already in history

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

Change-Id: Id100df463d5534831cfc4be6fcb89333475d70aa
 2021-04-13 19:08:30 +00:00
Danny Epstein
254953ec68 Merge "Allow getComponentName() to be used in tests" into sc-dev 2021-04-13 19:08:28 +00:00
TreeHugger Robot
c29da982ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4f8703b7d -s ours am: 214718fbec -s ours am: 85cd22e0fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea15a8d03b8821112ffa85e9f0aac85e83e2e201
 2021-04-13 19:08:01 +00:00
Yan Yan
2c817681f8 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" am: 7a50e7f206 am: b9b0d644a7 am: 735d9fe220 am: 0e817330e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672427

Change-Id: Ifb428105dbf50bea8a28fc30e6dd310bc624407b
 2021-04-13 19:07:47 +00:00
TreeHugger Robot
51e3262898 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c0d744e6a1 -s ours am: 8ec76482fa -s ours am: e159b9d964 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c7b40f3916c4c5677ae18c51423523f425c537b
 2021-04-13 19:07:29 +00:00
Jordan Liu
5b6f3db2ab Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 am: 79bd307a60 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663960

Change-Id: I7fcd7fb06beb5dafe8f72d8cff5babd13e73bce2
 2021-04-13 19:07:25 +00:00
TreeHugger Robot
6433164f8e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ca5de2464 -s ours am: fa811843fe -s ours am: 57805e14b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ddcecf41be482009a656296a6e574a0f7530367
 2021-04-13 19:07:16 +00:00
Matt Pietal
6ee6b37c2f Merge "QS Wallet priority placement" into sc-dev 2021-04-13 19:07:08 +00:00
Bill Yi
0bd939254d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-13 19:02:39 +00:00
Automerger Merge Worker
025e7c2d26 [automerger skipped] Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master am: 23c55673c6 am: 51bbfddd7d -s ours 
am skip reason: skip tag Change-Id I94e2ecd2075a577c5362293622ce5be5167cd91a with SHA-1 7f3393d849 is already in history

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

Change-Id: I36c218a5a6ad39ca07e261bf6beac78361e7b523
 2021-04-13 18:52:34 +00:00
TreeHugger Robot
85cd22e0fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4f8703b7d -s ours am: 214718fbec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2c88b412d05f93d1f52510b67c4a1f075a80d62
 2021-04-13 18:52:14 +00:00
Yan Yan
0e817330e9 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" am: 7a50e7f206 am: b9b0d644a7 am: 735d9fe220 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672427

Change-Id: I5ef61feb984e8562617853c178b19e93beb08bb2
 2021-04-13 18:51:58 +00:00
TreeHugger Robot
e159b9d964 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c0d744e6a1 -s ours am: 8ec76482fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia219d1dd512057a3c1595a850ad0bab928131ea0
 2021-04-13 18:51:33 +00:00
TreeHugger Robot
57805e14b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ca5de2464 -s ours am: fa811843fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01dedb5072545c36679273b62a3fd6377f64f4ab
 2021-04-13 18:51:08 +00:00
Automerger Merge Worker
51bbfddd7d Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master am: 23c55673c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671839

Change-Id: I33e4430689838b4ecd3aea4e2fa031727151e7d2
 2021-04-13 18:46:31 +00:00
Anna Zappone
d2d6550f9c Merge "Update user profiles on user unavailable" into sc-dev am: c8f4ca2a74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129845

Change-Id: I7c72dbffb97b8160b7df8ba645a9aa91b8a41ac6
 2021-04-13 18:46:21 +00:00
Jordan Liu
79bd307a60 Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663960

Change-Id: Ib5f376240ca9f1128e2edebcd7b5a9cf9319c7e6
 2021-04-13 18:45:53 +00:00
Joshua Mccloskey
3fcc226026 Merge "Added additional strings for fpm" into sc-dev am: 1ce11286e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14107199

Change-Id: Ib52dff8e33b944ca5b5333195a86be3d53a905d3
 2021-04-13 18:45:36 +00:00
Anna Zappone
c8f4ca2a74 Merge "Update user profiles on user unavailable" into sc-dev 2021-04-13 18:39:45 +00:00
Jordan Liu
98833ee208 Merge "Override the label of the SIM Toolkit application dynamically" 2021-04-13 18:30:19 +00:00
Automerger Merge Worker
23c55673c6 Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master 2021-04-13 18:26:41 +00:00
TreeHugger Robot
214718fbec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4f8703b7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd900bcd612dfc92643602502387b0ea549c6bbd
 2021-04-13 18:26:08 +00:00
Yan Yan
735d9fe220 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" am: 7a50e7f206 am: b9b0d644a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672427

Change-Id: I0f4c7848fcc1ed5edc3da1b0712d60c7a8bcc57f
 2021-04-13 18:26:01 +00:00
TreeHugger Robot
8ec76482fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c0d744e6a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0308e8d2e22a840a06b3a9a36c629d9a682049e8
 2021-04-13 18:25:29 +00:00
TreeHugger Robot
fa811843fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ca5de2464 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab1bbd09e0c24030e6e396366a81537814afcee8
 2021-04-13 18:24:34 +00:00