Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
622,011 Commits 3 Branches 0 Tags
82a1d2de1e4d73aedc255a24b0c22151cff2ff38
Commit Graph

622011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugene Susla
82a1d2de1e [automerger skipped] RESTRICT AUTOMERGE am: 3c2fece4a5 am: 73f0570cea -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46cc3698eb16bf0f438288ebfe4e67aa4c38c46d
 2021-02-03 00:42:16 +00:00
TreeHugger Robot
a6921e36df [automerger skipped] Merge "Fix thread safety issue on clearing cache" into rvc-qpr-dev am: 666deabeb8 -s ours am: f18f915e8a -s ours 
am skip reason: Change-Id I47d53a6d9d274bca4c78dbfd87e0097091b7b8cb with SHA-1 5e74205b8b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20c7ef5ce9f202d67466bc3daa0a004b0788950f
 2021-02-03 00:41:51 +00:00
TreeHugger Robot
fcc5aa50be Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 am: 82b0600bfe am: 519201b871 am: 68feffb983 am: 3d6c04b1ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00af246090a8ca441e17ac9b14c398c1679777f0
 2021-02-03 00:41:21 +00:00
Eugene Susla
cd470cd604 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours am: 282a2a51b4 am: 2c4a99cd30 am: 35b88a2ab3 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd6baa4e172fbcd72782768a9ce265957ce1d2c8
 2021-02-03 00:41:12 +00:00
TreeHugger Robot
9593709b41 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours am: 0debf904b1 -s ours am: 8af18c0771 -s ours am: 355f521339 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b8e30143410cbf445e8555eacf435645be9cf73
 2021-02-03 00:40:29 +00:00
Eugene Susla
73f0570cea RESTRICT AUTOMERGE am: 3c2fece4a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12931376

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec0d2821646244c13f5de537933abf9c5145b067
 2021-02-03 00:39:07 +00:00
Sarah Chin
7e1dd38c3a [automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" am: 5becb8f399 am: b9938fb47d -s ours am: 39d4439f73 -s ours 
am skip reason: Change-Id I2b987d24851cdb16d8457b0ec5c546ace5485ed0 with SHA-1 5d0e3a3404 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48c0ad16ece014baea0998094e8146965d50370d
 2021-02-03 00:38:59 +00:00
Automerger Merge Worker
f20f52a304 Merge "Merge "WebView: clarify CookieManager docs" am: 5844882671 am: d2243be46a" into rvc-qpr-dev-plus-aosp am: 8e92545adf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d66b86d7ad4990e3e8910816cfb6d78587b4d83
 2021-02-03 00:38:32 +00:00
Chris Li
5c3ad3a5a1 Merge "Allow non-resizable apps in split-screen (8/n)" into sc-dev 2021-02-03 00:38:22 +00:00
TreeHugger Robot
cb67204b6e [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours am: 45faf04f53 -s ours am: 21aa3adb81 -s ours am: a588a437c2 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ade0c7f02efe85fd53426ce05229247dffdf439
 2021-02-03 00:38:08 +00:00
TreeHugger Robot
e2698b2e6f [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into rvc-dev am: e42ea74fb1 -s ours am: 09376f38d2 -s ours am: 076784d654 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 bd6fc820a6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a2eb4408151f5c0fb0de36634f181d5311dbcbd
 2021-02-03 00:37:48 +00:00
TreeHugger Robot
f18f915e8a [automerger skipped] Merge "Fix thread safety issue on clearing cache" into rvc-qpr-dev am: 666deabeb8 -s ours 
am skip reason: Change-Id I8bee7a0a6acecc1274d5acc0adb44c5dde8862e4 with SHA-1 cfea49246b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1507d8789b36c7cfae71811e6cf1d8dbbfd2bba1
 2021-02-03 00:37:23 +00:00
TreeHugger Robot
3d6c04b1ef Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 am: 82b0600bfe am: 519201b871 am: 68feffb983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10120955776633da992a5279b0d566fb299b6900
 2021-02-03 00:36:57 +00:00
Eugene Susla
35b88a2ab3 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours am: 282a2a51b4 am: 2c4a99cd30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaebf72c5dc28ce873967da17190638b0093e1ca8
 2021-02-03 00:36:48 +00:00
TreeHugger Robot
355f521339 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours am: 0debf904b1 -s ours am: 8af18c0771 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icba32e999007f78845edae752edf63347a05e5af
 2021-02-03 00:36:21 +00:00
TreeHugger Robot
5e1f9a630b Merge "Pass in split permissions to ParsingPackageUtils." into sc-dev 2021-02-03 00:34:44 +00:00
TreeHugger Robot
666deabeb8 Merge "Fix thread safety issue on clearing cache" into rvc-qpr-dev 2021-02-03 00:25:15 +00:00
Chris Li
ee21983ae0 Merge "Allow non-resizable apps in split-screen (7/n)" into sc-dev 2021-02-03 00:24:54 +00:00
Sean Stout
16a89ea815 Merge "Send events when DisplayGroups are added/modified/removed" into sc-dev 2021-02-03 00:05:55 +00:00
TreeHugger Robot
68feffb983 Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 am: 82b0600bfe am: 519201b871 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id41d6d53a9ae797ead3c3637523db97585903fa4
 2021-02-03 00:04:48 +00:00
Eugene Susla
2c4a99cd30 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours am: 282a2a51b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib21a26c5c80be55c4a2f7d15e0a72306432e2239
 2021-02-03 00:04:45 +00:00
Sarah Chin
39d4439f73 [automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" am: 5becb8f399 am: b9938fb47d -s ours 
am skip reason: Change-Id I2b987d24851cdb16d8457b0ec5c546ace5485ed0 with SHA-1 5d0e3a3404 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11ed9c044e59b76e3d106b4598f21c6d5d855475
 2021-02-03 00:04:40 +00:00
Automerger Merge Worker
8e92545adf Merge "Merge "WebView: clarify CookieManager docs" am: 5844882671 am: d2243be46a" into rvc-qpr-dev-plus-aosp 2021-02-03 00:04:34 +00:00
Treehugger Robot
2ca4c0e66e Merge "WebView: clarify CookieManager docs" am: 5844882671 am: d2243be46a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I130a75f2e07ccb592ec300fa69f729ab367cbd7d
 2021-02-03 00:04:29 +00:00
TreeHugger Robot
a588a437c2 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours am: 45faf04f53 -s ours am: 21aa3adb81 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic74ed9407d05aa6e8a6b3d4d1c888d99ac6481d4
 2021-02-03 00:04:13 +00:00
TreeHugger Robot
8af18c0771 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours am: 0debf904b1 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id62b92d68155753adcddfbfc50bd247a0f3ebd01
 2021-02-03 00:03:58 +00:00
TreeHugger Robot
076784d654 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into rvc-dev am: e42ea74fb1 -s ours am: 09376f38d2 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 bd6fc820a6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f2cf522eaf85a7665d0eef2829b9068238baaa3
 2021-02-03 00:03:47 +00:00
TreeHugger Robot
519201b871 Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 am: 82b0600bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18cb7361ca96526aa490e5e5be697e8f9f5660b8
 2021-02-02 23:50:06 +00:00
Eugene Susla
282a2a51b4 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8d440710fb9aa9a206b6da61af96c2eb53fac63
 2021-02-02 23:50:02 +00:00
TreeHugger Robot
82b0600bfe Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64ece3292d6cd088455547b0365ea4ffc8e6378c
 2021-02-02 23:49:50 +00:00
Eugene Susla
175d275bb9 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bdb66b2c06a2a1ae249c0eb31dac2ae8101fbbb
 2021-02-02 23:49:46 +00:00
TreeHugger Robot
0debf904b1 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If34ea04b7480c79673ee9657abc59ab799f0a039
 2021-02-02 23:49:43 +00:00
Sarah Chin
b9938fb47d Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" am: 5becb8f399 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571130

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I165eaa765fbcac7dc4030d7cfafecef3cc84d01c
 2021-02-02 23:36:27 +00:00
TreeHugger Robot
a1a18aa7ba [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into rvc-qpr-dev am: 06c81b12f4 am: 1acb247f60 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 df8852a0b5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8cb439b0c66f88ada5767fb2aff13142c54feaf
 2021-02-02 23:30:32 +00:00
TreeHugger Robot
260d69a4d5 Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dc66b1d02903fbf4bdbd6053787168281bedcd6
 2021-02-02 23:30:04 +00:00
Eugene Susla
56cc3b82c2 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59451725f8eea4a9a6587d7f8d3272a24ee486e4
 2021-02-02 23:29:59 +00:00
TreeHugger Robot
8553c69d00 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a9b70882e5 -s ours am: 90e55c0118 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59e29b0cee282018bc973b96d1746ff81d8f3055
 2021-02-02 23:29:53 +00:00
Treehugger Robot
d2243be46a Merge "WebView: clarify CookieManager docs" am: 5844882671 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8c3c73caf1896022571c334329c2d029b6603cc
 2021-02-02 23:29:40 +00:00
TreeHugger Robot
21aa3adb81 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours am: 45faf04f53 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12daa4725196e51ec969f662065f7833b5ddff58
 2021-02-02 23:28:41 +00:00
TreeHugger Robot
146953dfff [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 b7d4c8098d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2843e5d6ac13dc77185a4ab5647c521042656b57
 2021-02-02 23:28:19 +00:00
TreeHugger Robot
09376f38d2 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into rvc-dev am: e42ea74fb1 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 bd6fc820a6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice121646d3f385ffccf511514d62222dc470bed0
 2021-02-02 23:28:17 +00:00
TreeHugger Robot
45faf04f53 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e95a44cc6f421d454f7d42e538a8f25c1d29471
 2021-02-02 23:28:13 +00:00
Joshua Mccloskey
8155ef9ea1 Merge "Added default method to Fingerprint21" into sc-dev 2021-02-02 23:19:48 +00:00
Eugene Susla
3c2fece4a5 RESTRICT AUTOMERGE 
Prevent non-system overlays from showing over CDM UI

Since CDM grants privileges, it should have the same overlay
policy as permission UI

Test: use an app wit ha visible overlay to ensure
the overlay disappears when CDM is shown
Fixes: 171221090
Change-Id: I004843edf5a156dc07fb961edf80272f5cb50163
(cherry picked from commit ea4ce4d48e)
 2021-02-02 23:19:39 +00:00
TreeHugger Robot
1acb247f60 Merge "[SettingsProvider] extend font size scale range" into rvc-qpr-dev am: 06c81b12f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I663571a4c501aa172faa4c4c035774cddbe9b944
 2021-02-02 23:06:51 +00:00
TreeHugger Robot
90e55c0118 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a9b70882e5 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e7ef1abb23551cf3e5a8b61092117263bd2146
 2021-02-02 23:06:20 +00:00
TreeHugger Robot
99e5a28c5b Merge changes from topic "cdm_overlay-pi-dev" into pi-dev 
* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
 2021-02-02 23:03:57 +00:00
Amy Zhang
8101a510e9 Merge "Connect Filter Event Callback between the TunerService and TunerClient" into sc-dev 2021-02-02 23:00:36 +00:00
Lais Andrade
27225f685c Merge "Implement dump and vibrate cmds for Vibrator Manager" into sc-dev 2021-02-02 22:58:54 +00:00
Sarah Chin
5becb8f399 Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" 2021-02-02 22:58:01 +00:00