Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
620,192 Commits 3 Branches 0 Tags
d89f6bf37a68c80b49db32dd56dcfdff1a890ea3
Commit Graph

620192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Varun Shah
d89f6bf37a Ensure certain new UsageEvents have a String mapping. 
Bug: n/a
Test: m
Change-Id: I7aa9f0fcb7799f36e16351e44db35faeb46aa083
 2021-01-22 21:56:37 +00:00
Bill Yi
60a993de14 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-22 21:51:44 +00:00
Daniel Bright
f0d0d2afe9 [automerger skipped] Merge "Add Radio Interface Capabilities" am: e44156cfd6 am: c24ad90810 am: fa78c56da8 -s ours 
am skip reason: Change-Id I56713e05cbd5200baa2a3bc79f7f4b0d580ad2a1 with SHA-1 6ceef2d6a5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae4b4ab76d4944e203985101d6237279cf6c841e
 2021-01-22 21:13:58 +00:00
Daniel Bright
fa78c56da8 Merge "Add Radio Interface Capabilities" am: e44156cfd6 am: c24ad90810 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522306

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18cccffb56b7c6fd1c056075c914634235457722
 2021-01-22 20:58:28 +00:00
TreeHugger Robot
dbaf5b4fbb [automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev am: 9023676dfe -s ours am: f0e5190e0b am: e643cc6d90 am: c6c62aeb64 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea5a1493680f8851945d6d7670062dc8d10c6c78
 2021-01-22 20:55:24 +00:00
Garfield Tan
2c468f1be5 Merge "Revert "Let WM shell set launch display area per params"" 2021-01-22 20:50:30 +00:00
TreeHugger Robot
30ed573931 [automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev am: 9023676dfe -s ours am: f0e5190e0b am: c9912fa873 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a1665d6384f8c6e5dc7868f67e3146ca9f230ab
 2021-01-22 20:18:41 +00:00
TreeHugger Robot
c6c62aeb64 [automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev am: 9023676dfe -s ours am: f0e5190e0b am: e643cc6d90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13355795

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida5382b284008db86aa94f1af2496d73d83cb656
 2021-01-22 20:18:23 +00:00
Garfield Tan
32b259c8ed Revert "Let WM shell set launch display area per params" 
This reverts commit 6de3d810bb.

Reason for revert: Build breaks.

Change-Id: I66826a2037b225bd5afcf1d8934e630ab0fc4625
 2021-01-22 20:12:59 +00:00
Daniel Bright
c24ad90810 Merge "Add Radio Interface Capabilities" am: e44156cfd6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522306

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80d7cb9853d1255de506c68dd600149f5bddbcba
 2021-01-22 20:10:02 +00:00
George Burgess IV
8c080c527e Merge "androidfw: use a vector instead of manually managing memory" am: 972a78726b am: 490a13d53b am: b45ba7742f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555550

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4999c11ba9ee999777497136da754b7b56ed0b43
 2021-01-22 20:08:26 +00:00
TreeHugger Robot
c9912fa873 [automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev am: 9023676dfe -s ours am: f0e5190e0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13355795

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I164d353133c838a00fd8ea131f83b0658595f5d3
 2021-01-22 20:06:24 +00:00
TreeHugger Robot
e643cc6d90 [automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev am: 9023676dfe -s ours am: f0e5190e0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13355795

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib523279b657b5c1187c98fa72457bd2679dbcac9
 2021-01-22 20:05:36 +00:00
Ytai Ben-tsvi
bca24bb721 Merge "Fix race condition in SoundTriggerHw2Enforcer" 2021-01-22 19:46:46 +00:00
Jordan Liu
ac1f060651 Merge "Add carrier config for carrier key" 2021-01-22 19:43:08 +00:00
George Burgess IV
b45ba7742f Merge "androidfw: use a vector instead of manually managing memory" am: 972a78726b am: 490a13d53b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555550

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ec42a3bf188a6c1093ce9653fc1b26c6788154a
 2021-01-22 19:32:13 +00:00
TreeHugger Robot
f0e5190e0b [automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev am: 9023676dfe -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33fe23c5f53ef9ae27f2bbd1563647024643e049
 2021-01-22 19:29:21 +00:00
Jordan Liu
5050ce2d31 Merge "Add BROADCAST_CLOSE_SYSTEM_DIALOGS to allolist for cbr" 2021-01-22 19:13:18 +00:00
Dmitri Plotnikov
d23c73f017 Merge "Convert SensorPowerCalculator to work with BatteryUsageStats" 2021-01-22 19:10:33 +00:00
Daniel Bright
e44156cfd6 Merge "Add Radio Interface Capabilities" 2021-01-22 19:08:21 +00:00
TreeHugger Robot
6c09cd99d3 Merge "Let WM shell set launch display area per params" 2021-01-22 19:02:07 +00:00
TreeHugger Robot
9023676dfe Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev 2021-01-22 18:58:04 +00:00
Ying Xu
5cde6cbcbe Merge "Check whether qsIcon is null before using it" 2021-01-22 18:54:55 +00:00
George Burgess IV
490a13d53b Merge "androidfw: use a vector instead of manually managing memory" am: 972a78726b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555550

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I498376352452606cdd8ac7d28817ece60002cec4
 2021-01-22 18:45:01 +00:00
George Burgess IV
972a78726b Merge "androidfw: use a vector instead of manually managing memory" 2021-01-22 18:20:58 +00:00
Songchun Fan
8b444c2c01 Merge "[SettingsProvider] @Readable annotation to restrict access to hidden keys" 2021-01-22 18:07:31 +00:00
Jeremy Joslin
de162a46ef Merge "New feature: FEATURE_SECURITY_MODEL_COMPATIBLE" 2021-01-22 17:58:30 +00:00
Dan Harms
fdebebe16a Merge "Remove bundled CompanionDeviceSupport permissions" 2021-01-22 17:57:52 +00:00
Cody Kesting
8f310ec9ad Merge "Implement Policy Listener add/remove in VcnService." am: 59035bd8c7 am: 3661eba6cc am: 0e6ac91cdc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0a3fe3d29c52fc7fe349f7eb9af9899fbebbcee
 2021-01-22 17:55:04 +00:00
Corina Grigoras
1744f3021f Merge "Add all storage team to owners." am: d17c69bccb am: 552bdafa3a am: 2baff21819 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f2185e68fde92fa65708765faa1e5be4be9b73f
 2021-01-22 17:53:46 +00:00
Gavin Corkery
8f9a709836 Merge "Remove dumpstate error race condition" am: 5c67510b4f am: 8f01336f0d am: f85308beef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a5be59a2e8620005a0892a0f24d25c073af341d
 2021-01-22 17:53:04 +00:00
Matt Pietal
69804ee487 Merge "AOD/LS - Switch to small clock with notifications and bypass" 2021-01-22 17:52:02 +00:00
Linus Tufvesson
cf4848b289 Merge "Update Settings#canDrawOverlays" 2021-01-22 17:45:09 +00:00
Cody Kesting
0e6ac91cdc Merge "Implement Policy Listener add/remove in VcnService." am: 59035bd8c7 am: 3661eba6cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9399ea6e21930adfa0c44767b7714f7e35cf64a
 2021-01-22 17:40:04 +00:00
Corina Grigoras
2baff21819 Merge "Add all storage team to owners." am: d17c69bccb am: 552bdafa3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f9bdaf72fc875a0949d897558f0e1dd07a853d0
 2021-01-22 17:39:39 +00:00
Cody Kesting
3661eba6cc Merge "Implement Policy Listener add/remove in VcnService." am: 59035bd8c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6a3af9de981897cdd843f12d4c012da5929bc58
 2021-01-22 17:29:37 +00:00
Varun Shah
d41834b696 Merge "Don't hold AMS lock while calling into USS." 2021-01-22 17:27:14 +00:00
Adam Bookatz
35202d7bf0 Merge "UserSystemPackageInstaller auto-treats static overlays" 2021-01-22 17:25:10 +00:00
Hui Yu
076223fb0c Merge "Add param isCheckingForFgsStart to areBackgroundActivityStartsAllowed()." 2021-01-22 17:23:05 +00:00
Cody Kesting
59035bd8c7 Merge "Implement Policy Listener add/remove in VcnService." 2021-01-22 17:20:12 +00:00
Corina Grigoras
552bdafa3a Merge "Add all storage team to owners." am: d17c69bccb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I200d89f67f545bccf7fb990f4b5c7d6f38b1c808
 2021-01-22 17:16:50 +00:00
Gavin Corkery
f85308beef Merge "Remove dumpstate error race condition" am: 5c67510b4f am: 8f01336f0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I221ac8d6327121805d2309234d12286dda6f9858
 2021-01-22 17:16:44 +00:00
Corina Grigoras
d17c69bccb Merge "Add all storage team to owners." 2021-01-22 16:57:22 +00:00
Ytai Ben-tsvi
752b1e59c9 Merge changes from topic "aidlize-aps" 
* changes:
  Initialize format in AudioMix conversion
  Respect config_mask in AudioPortConfig conversion
 2021-01-22 16:56:24 +00:00
vichang
1c2e2f76ad Merge changes from topic "icu68" am: e17a139088 am: 714b3ec814 am: e10a7b9910 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95bcc68ca268b23524cf327fb2efa6f54df232df
 2021-01-22 16:43:05 +00:00
Lucas Dupin
3098553de0 Merge "Make shade transparent under a flag" 2021-01-22 16:42:41 +00:00
Felipe Leme
9c9b4476c6 Merge "Added car_large_avatar_badge_size dimension." 2021-01-22 16:33:07 +00:00
Felipe Leme
7dc7910d9a Merge "Added evenWhenDisallowed param to removeUserOrSetEphemeral()." 2021-01-22 16:31:03 +00:00
vichang
e10a7b9910 Merge changes from topic "icu68" am: e17a139088 am: 714b3ec814 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie97caf105d4a1c2ea8da991376f10545daab34d1
 2021-01-22 16:28:20 +00:00
Gavin Corkery
8f01336f0d Merge "Remove dumpstate error race condition" am: 5c67510b4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice28160099c9b46baeff8cac76137e6b81b76a67
 2021-01-22 16:27:56 +00:00