Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,971 Commits 3 Branches 0 Tags
7a75d4ebebb3dada31cd9cd4c74bfa8ae9fee3a9
Commit Graph

760971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Göllner
7a75d4ebeb Merge "Media layout changes for tablets" into tm-dev am: d7b3be3e0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17293763

Change-Id: I14acf684dbda5616e72031f411e23213421afc04
 2022-03-24 01:01:38 +00:00
Automerger Merge Worker
9fc215d160 Merge "[automerger skipped] Merge "DO NOT MERGE Fix Emulator not emitting folding features." into sc-v2-dev am: c7dada96bb am: df6fc64952 -s ours am: c3cf521667 -s ours" 2022-03-24 01:01:31 +00:00
Automerger Merge Worker
cd6695e205 Merge "[automerger skipped] Merge "Ref count isolated uid use for long partial wakelocks" into tm-dev am: 7dd534b98a am: 2766767565 -s ours" 2022-03-24 01:01:20 +00:00
Diego Vela
3de3a8b2fb [automerger skipped] Merge "DO NOT MERGE Fix Emulator not emitting folding features." into sc-v2-dev am: c7dada96bb am: df6fc64952 -s ours am: c3cf521667 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33bb7bfbe68a8aedc61733442516a210ed1f5c3c
 2022-03-24 01:01:06 +00:00
Automerger Merge Worker
51486b3d00 Merge "[automerger skipped] Merge "Add setEthernetEnabled and its listener API" am: 3b4812350f am: c05949b4af am: 5a00916196 -s ours am: 41c41f9821 -s ours" 2022-03-24 01:00:51 +00:00
Michael Wachenschwanz
2f65a89a19 [automerger skipped] Merge "Ref count isolated uid use for long partial wakelocks" into tm-dev am: 7dd534b98a am: 2766767565 -s ours 
am skip reason: Merged-In I86456137e6d6ad47f9974da281defc04d20fb32f with SHA-1 7589e541d1 is already in history

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

Change-Id: I33c428278fa9a61eeaebe37e9796b581d3d71cbe
 2022-03-24 01:00:50 +00:00
Chavi Weingarten
9e871a2998 Merge "Add forceDrawNextFrame function for HardwareRenderer" into tm-dev am: 3e3c3ab2da am: 1c105faded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17263076

Change-Id: I88dcb88872ed3261d26249cf36c6b832904a31d7
 2022-03-24 01:00:19 +00:00
Treehugger Robot
5e11874130 [automerger skipped] Merge "Add setEthernetEnabled and its listener API" am: 3b4812350f am: c05949b4af am: 5a00916196 -s ours am: 41c41f9821 -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

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

Change-Id: I26ea860ecbfa1bb2570716f7e97d1ad6448c2307
 2022-03-24 01:00:18 +00:00
Automerger Merge Worker
8324773740 Merge "Merge "Minor Copy/Paste overlay UI edits" into tm-dev am: 1c6f7596c2 am: 5ec515bfe1" 2022-03-24 01:00:12 +00:00
Matt Casey
a03d42f04a Merge "Minor Copy/Paste overlay UI edits" into tm-dev am: 1c6f7596c2 am: 5ec515bfe1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183294

Change-Id: Idf55aff5c770da65073094b7ec43db8d465ce617
 2022-03-24 00:59:41 +00:00
Rambo Wang
c5359af4b3 [automerger skipped] Merge "Update TelephonySubscriptionTracker to use new CPCallback interface" am: f146ee5a1b am: 66d19b9f34 am: c3f28b7786 -s ours am: 1e0618ac80 -s ours 
am skip reason: Merged-In I58dbbc4b7b135781bc5f4b5bc35b29075fc6a619 with SHA-1 374f0045ba is already in history

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

Change-Id: Ia2800566769b968dc19cb1c0d9fd23c1484e6b4d
 2022-03-24 00:59:39 +00:00
Automerger Merge Worker
a6583f02eb Merge "[automerger skipped] Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" am: 8ec6343dfb am: d81fc9d312 am: 8f04c7b7f3 -s ours am: 9dc8e3b27a -s ours" 2022-03-24 00:59:28 +00:00
Rambo Wang
ad559df76a [automerger skipped] Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" am: 8ec6343dfb am: d81fc9d312 am: 8f04c7b7f3 -s ours am: 9dc8e3b27a -s ours 
am skip reason: Merged-In I29df8599bdfc84cab330fa7056a228997a4bac0f with SHA-1 28b2ee8ec0 is already in history

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

Change-Id: I5b426c99c2b6ccb607b1d3e965808caf05645a3f
 2022-03-24 00:58:47 +00:00
Hawkwood Glazier
f151bcfc60 Merge "Pause squiggle animation when seeking" into tm-dev am: 2e92c6b7f7 am: ca039b430f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17300207

Change-Id: I5c46166a4b2439528ce539a2b6b20346e02cd558
 2022-03-24 00:58:34 +00:00
Automerger Merge Worker
215232a9a2 Merge "Merge "User Switcher: Polish tap on user switcher." into tm-dev am: c7ce201c2c am: 06cc7ae31e" 2022-03-24 00:58:27 +00:00
Aaron Liu
ae2da10912 Merge "User Switcher: Polish tap on user switcher." into tm-dev am: c7ce201c2c am: 06cc7ae31e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17298455

Change-Id: Iaadf9e494b149931d04d1eed38e4f28410ee85e9
 2022-03-24 00:57:53 +00:00
Automerger Merge Worker
5fb510232b Merge changes from topic "am-5fd632db78854bd4ad7424dfb900f5c8" 
* changes:
  Merge changes from topic "presubmit-am-6493193fb96f4675a3f0727cb0aa9ffa" into sc-v2-dev-plus-aosp am: 5f634bf42e am: d8014c8554
  [automerger skipped] [automerge] DO NOT MERGE Fix Emulator not emitting folding features. 2p: 98ca72c5f8 am: fac09ad9ab -s ours am: d7100bd7b7 -s ours
 2022-03-24 00:57:52 +00:00
TreeHugger Robot
dc29028d2b [automerger skipped] Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev am: cbb04a4286 -s ours am: 076a758f5d -s ours am: 329ed6ef8e -s ours am: 2d795b5ecf -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 efc50877d2 is already in history

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

Change-Id: I04ab43c21f1864fb747def1c365edd17e4fbe17b
 2022-03-24 00:57:20 +00:00
Diego Vela
04d4194a66 Merge changes from topic "presubmit-am-6493193fb96f4675a3f0727cb0aa9ffa" into sc-v2-dev-plus-aosp am: 5f634bf42e am: d8014c8554 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17342980

Change-Id: I798b2139979bd56bc542a0907f1f6b2eeb362878
 2022-03-24 00:57:17 +00:00
Presubmit Automerger Backend
eb35a0fc84 [automerger skipped] [automerge] DO NOT MERGE Fix Emulator not emitting folding features. 2p: 98ca72c5f8 am: fac09ad9ab -s ours am: d7100bd7b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcbd2ee422c9152a045d8d8beae9e29b6f16f683
 2022-03-24 00:57:04 +00:00
Automerger Merge Worker
22d5d8b217 Merge changes from topic "am-ea04d9eedac6402a8697a32f924ea148" 
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d398625 -s ours am: 8572affd55 -s ours am: 0fbd1b97aa -s ours
  [automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2 am: 34f0951f96 -s ours am: 2f137b638f -s ours am: 6408dcefee -s ours
 2022-03-24 00:56:53 +00:00
Automerger Merge Worker
c26695d4d0 Merge changes from topic "am-873e5e9aa4f544fd825d14c334f8e89e" 
* changes:
  [automerger skipped] Merge "Ref count isolated uid use for long partial wakelocks" into tm-dev am: 7dd534b98a -s ours
  [automerger skipped] Ref count isolated uid use for long partial wakelocks am: 7589e541d1 -s ours
 2022-03-24 00:56:51 +00:00
TreeHugger Robot
6de5023a91 [automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d398625 -s ours am: 8572affd55 -s ours am: 0fbd1b97aa -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

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

Change-Id: Id97727b988f2063b9cef6c46e71ff978abd98b8d
 2022-03-24 00:56:30 +00:00
Michael Wachenschwanz
56be529e10 [automerger skipped] Merge "Ref count isolated uid use for long partial wakelocks" into tm-dev am: 7dd534b98a -s ours 
am skip reason: Merged-In I86456137e6d6ad47f9974da281defc04d20fb32f with SHA-1 fd48aa6fa6 is already in history

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

Change-Id: Ic843387532d5475f97309e5e26bbc8660d87169a
 2022-03-24 00:56:18 +00:00
Presubmit Automerger Backend
b22c76f58c [automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2 am: 34f0951f96 -s ours am: 2f137b638f -s ours am: 6408dcefee -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

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

Change-Id: Ia67901aaf4feb5a2814d7fb654ddc6e1c27e148c
 2022-03-24 00:56:14 +00:00
Michael Wachenschwanz
041b8bf1f0 [automerger skipped] Ref count isolated uid use for long partial wakelocks am: 7589e541d1 -s ours 
am skip reason: Merged-In I86456137e6d6ad47f9974da281defc04d20fb32f with SHA-1 fd48aa6fa6 is already in history

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

Change-Id: I926cdd69f95df83160a8824839865cf0093e3a69
 2022-03-24 00:55:45 +00:00
Lais Andrade
70af59ebb0 Merge "Fix PIN lock pattern not respecting user settings" into tm-dev am: 352d8d7abe am: a67d59dde1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320107

Change-Id: Iacda3ca6d7aed3f8e88aed1dccaf0f904dee492f
 2022-03-24 00:55:25 +00:00
Chavi Weingarten
0f9cba9546 Merge "Add forceDrawNextFrame function for HardwareRenderer" into tm-dev am: 3e3c3ab2da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17263076

Change-Id: Iaf253798ddd4a0d752a4138aeff906ee8adb8a74
 2022-03-24 00:54:04 +00:00
Matt Casey
dbaeec84a7 Merge "Minor Copy/Paste overlay UI edits" into tm-dev am: 1c6f7596c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183294

Change-Id: I27bac02ce00d09005877e52091e331260d18768d
 2022-03-24 00:53:17 +00:00
Hawkwood Glazier
4990a54f85 Merge "Pause squiggle animation when seeking" into tm-dev am: 2e92c6b7f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17300207

Change-Id: I631c61e1d7ff013b3339669cfe338f0e8a55b9b1
 2022-03-24 00:52:16 +00:00
Automerger Merge Worker
6e5bd053ec Merge "Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev am: 6563740430 am: 64e2895add" 2022-03-24 00:52:09 +00:00
Automerger Merge Worker
121e0df874 Merge "Merge "User Switcher: Polish tap on user switcher." into tm-dev am: c7ce201c2c" 2022-03-24 00:51:50 +00:00
Alex Johnston
9ac6d765d1 Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev am: 6563740430 am: 64e2895add 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220109

Change-Id: I2a67f7698492d56184835260e32a3092a57af0d7
 2022-03-24 00:51:47 +00:00
Automerger Merge Worker
878e910735 Merge "Merge "Fix an issue where stack education and the stack weren't aligned" into tm-dev am: 4db1adb65e am: 14a8e9a3e3" 2022-03-24 00:51:37 +00:00
Aaron Liu
df9720d3ab Merge "User Switcher: Polish tap on user switcher." into tm-dev am: c7ce201c2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17298455

Change-Id: I69c74798d4390c5d30cc9a65ff6b20cba2cebc84
 2022-03-24 00:51:29 +00:00
Mady Mellor
8ae58efa23 Merge "Fix an issue where stack education and the stack weren't aligned" into tm-dev am: 4db1adb65e am: 14a8e9a3e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326809

Change-Id: I4cc4955e88ca27b6200ff7a32b4d1c0622687bcf
 2022-03-24 00:51:07 +00:00
TreeHugger Robot
9f9fbb846d [automerger skipped] Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev am: cbb04a4286 -s ours am: 076a758f5d -s ours am: 329ed6ef8e -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 efc50877d2 is already in history

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

Change-Id: Ide4b4a190c55d963f5a05c0d3be055d6bd419e8f
 2022-03-24 00:51:05 +00:00
Automerger Merge Worker
6deef53647 Merge changes from topic "am-5de743b640c4436eb27171a969fde82c" 
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d398625 -s ours am: 8572affd55 -s ours
  [automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2 am: 34f0951f96 -s ours am: 2f137b638f -s ours
 2022-03-24 00:50:59 +00:00
TreeHugger Robot
e8760c36d4 [automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d398625 -s ours am: 8572affd55 -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

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

Change-Id: I3d6c10ccd2f890a99c54f1817e660ceade0bfce8
 2022-03-24 00:50:21 +00:00
Mady Mellor
5e52790f2b Merge "Adjust the sizes of user education for large screens / landscape" into tm-dev am: 139a3c1803 am: 7691917579 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326808

Change-Id: I80b5dcff1145e4f1e2484b4d0a18b6668a40e312
 2022-03-24 00:50:14 +00:00
Automerger Merge Worker
2297633978 Merge "Merge changes from topic "presubmit-am-fd9c10e17ae94cf5b5b47b78cd7c56b3" into tm-dev am: 04b5ad3c49 am: 9684520e8c" 2022-03-24 00:49:59 +00:00
Presubmit Automerger Backend
1fcec65502 [automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2 am: 34f0951f96 -s ours am: 2f137b638f -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

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

Change-Id: I4a4dc207abd16f547df390a8204c2d9ab05d92dc
 2022-03-24 00:49:46 +00:00
Kohsuke Yatoh
64481758de Merge changes from topic "presubmit-am-fd9c10e17ae94cf5b5b47b78cd7c56b3" into tm-dev am: 04b5ad3c49 am: 9684520e8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17314948

Change-Id: I86653f467f6407610c02a7ebf2a675fa75c8e148
 2022-03-24 00:49:27 +00:00
Lais Andrade
55b9467f70 Merge "Fix PIN lock pattern not respecting user settings" into tm-dev am: 352d8d7abe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320107

Change-Id: I9d6b5ec4c40c9bb7a201d7b5acda1d56b9a9d8f2
 2022-03-24 00:49:15 +00:00
Automerger Merge Worker
85a2dfa587 Merge "Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev am: 6563740430" 2022-03-24 00:49:03 +00:00
Alex Johnston
489d1e3b1d Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev am: 6563740430 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220109

Change-Id: I92f545ec58d5c0ce08475e5b93cceda278e98b9f
 2022-03-24 00:48:21 +00:00
Shaun Corkran
f200bfc30f Merge "Add CrossTaskNavigations API to restrict navigation from current task" into tm-dev am: a4889a2180 am: fcd049242b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17161301

Change-Id: Ic4f70fc28af2530b17ccec73b20035f4ad25899d
 2022-03-24 00:48:18 +00:00
Nataniel Borges
9de0be368b Merge "Allow LaunchBubble app to be launcher from launcher" into tm-dev am: e08000c02d am: fe5a8ca2b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002569

Change-Id: I8104c49448a597d2d1fa372b503b5b582b62a0ed
 2022-03-24 00:47:22 +00:00
Automerger Merge Worker
6ebb000d01 Merge "Merge "Introduce updateVisibility and updateLayout" into tm-dev am: 0797d97536 am: 34df5ce8f9" 2022-03-24 00:47:13 +00:00
Tiger Huang
df625416a3 Merge "Introduce updateVisibility and updateLayout" into tm-dev am: 0797d97536 am: 34df5ce8f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17292204

Change-Id: Idcc57b8de399c7db6ff44c160f48a76d48ac48a6
 2022-03-24 00:46:48 +00:00