Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
443,422 Commits 3 Branches 0 Tags
0d4be73ea0034ea4650cb24c2b9687e16c76069b
Commit Graph

443422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Holk
0d4be73ea0 [automerger skipped] Merge "[view compiler] Add test coverage for layouts compiled from APK" am: a2b218db06 am: 9142ac8119 am: efa011f8a3 
am: b79c764c82 -s ours
am skip reason: change_id Ifc6719c2f438474b5474def02422ef68eee800b2 with SHA1 960a1a4bc9 is in history

Change-Id: I130bb42989ce773cebc98f5a8c6e94132ba97886
 2019-09-06 16:15:43 -07:00
Brad Ebinger
18206aecea Merge "Re-deprecating Capabilities in ImsFeature" am: f4cd3de77a am: 36d3aa0e02 am: 86d97445cf 
am: 384b50304f

Change-Id: Ib8d2e1d1184a168dee79ac3e31b6a46f4c0b3ac5
 2019-09-06 16:09:32 -07:00
Eric Holk
b79c764c82 Merge "[view compiler] Add test coverage for layouts compiled from APK" am: a2b218db06 am: 9142ac8119 
am: efa011f8a3

Change-Id: I5504845897c0d7eccb5a94a0cf0bd4a57aa78ba1
 2019-09-06 15:12:09 -07:00
Brad Ebinger
384b50304f Merge "Re-deprecating Capabilities in ImsFeature" am: f4cd3de77a am: 36d3aa0e02 
am: 86d97445cf

Change-Id: I405d270b964f93e643b1630250bc09dda229987a
 2019-09-06 14:56:40 -07:00
Eric Holk
efa011f8a3 Merge "[view compiler] Add test coverage for layouts compiled from APK" am: a2b218db06 
am: 9142ac8119

Change-Id: I35a74d2ed6c1920672b61981a9d6b40b3b089495
 2019-09-06 14:49:05 -07:00
Pengquan Meng
e99edb8a91 [automerger skipped] Merge "Support maximum wait time for Cell broadcast" am: 156f347db4 am: 0362123033 am: 90247580a7 
am: 7af3d7f0c0 -s ours
am skip reason: change_id If3d8d7915f2d86da20c63e99bee01f30e3ea89c0 with SHA1 02d6ac0f20 is in history

Change-Id: Ifca1d768fd0b423dbad7193526491da6517e7767
 2019-09-06 14:49:01 -07:00
Erin Yan
c5728033af [automerger skipped] Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev am: 46e4dd099c 
am: 06ab601fef -s ours
am skip reason: change_id I0016290a5181b9acba73503f938772b90f583f66 with SHA1 13ae817be2 is in history

Change-Id: I6e50ee04646bb018e2a462d2c418defecccaa627
 2019-09-06 14:41:40 -07:00
Brad Ebinger
86d97445cf Merge "Re-deprecating Capabilities in ImsFeature" am: f4cd3de77a 
am: 36d3aa0e02

Change-Id: Id9ea164e537b6f12b2af02f2833b0f95d3391e1c
 2019-09-06 14:33:57 -07:00
Pengquan Meng
7af3d7f0c0 Merge "Support maximum wait time for Cell broadcast" am: 156f347db4 am: 0362123033 
am: 90247580a7

Change-Id: Ia785431a50d6fa6343a6cd67b31f57416004ad51
 2019-09-06 14:33:39 -07:00
Erin Yan
06ab601fef Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev 
am: 46e4dd099c

Change-Id: Ifc668b6004946f1669f8c5e57bca697276edb820
 2019-09-06 14:27:25 -07:00
Eric Holk
9142ac8119 Merge "[view compiler] Add test coverage for layouts compiled from APK" 
am: a2b218db06

Change-Id: I4e6e938ea8f831182550966ea7cfccb258fb05ca
 2019-09-06 14:26:37 -07:00
Pengquan Meng
90247580a7 Merge "Support maximum wait time for Cell broadcast" am: 156f347db4 
am: 0362123033

Change-Id: I08d29451c56e9f0405399eddbc3c4fc662ee1b6a
 2019-09-06 14:22:00 -07:00
TreeHugger Robot
04e80fa640 Merge "Don't start first human user twice on headless-system mode." 2019-09-06 21:05:12 +00:00
Treehugger Robot
a2b218db06 Merge "[view compiler] Add test coverage for layouts compiled from APK" 2019-09-06 20:40:22 +00:00
Chavi Weingarten
c4ee1101f5 Merge "Remove setGeometryAppliesWithResize" 2019-09-06 20:18:21 +00:00
Eugene Susla
f5695a7725 [automerger skipped] Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev am: 299cd3ccae 
am: 13cfe928a3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia927a95b7e5e7f9397bbeee2f624cb66d5e35605
 2019-09-06 12:59:00 -07:00
TreeHugger Robot
46e4dd099c Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev 2019-09-06 19:58:47 +00:00
Eugene Susla
f481322819 [automerger skipped] [DO NOT MERGE] Copy appop modes on write to avoid locked IO am: 3454f3e9f9 
am: 48d07322f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I963d1928e3b149d477aceaa77f726de66214bfb4
 2019-09-06 12:56:01 -07:00
Beverly
5e9cb4d574 Merge "Fix zen alarms only mode check" into qt-qpr1-dev am: 9c81f1754c 
am: f50e3d227e

Change-Id: I82d1b81e891e45090963b4fbae0130a01c739882
 2019-09-06 12:52:27 -07:00
Bernardo Rufino
ffdc7d9b35 Merge "Don't consider tasks with INITIALIZING top activity as visible" 2019-09-06 19:43:13 +00:00
Eugene Susla
13cfe928a3 Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev 
am: 299cd3ccae

Change-Id: Ie9de464aab5eeef35118fc0711b0c15fcec0e88f
 2019-09-06 12:43:03 -07:00
Eugene Susla
48d07322f4 [DO NOT MERGE] Copy appop modes on write to avoid locked IO 
am: 3454f3e9f9

Change-Id: I4bb98a81ca8e1ea78448e5a7097b9577d62fc92c
 2019-09-06 12:42:58 -07:00
Beverly
f50e3d227e Merge "Fix zen alarms only mode check" into qt-qpr1-dev 
am: 9c81f1754c

Change-Id: Icc9bff293fec3cf4ddd4255b74a4709b249bb7e9
 2019-09-06 12:38:07 -07:00
Miranda Kephart
c2e91d6dcb Merge "Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545" 2019-09-06 19:30:55 +00:00
TreeHugger Robot
299cd3ccae Merge "[DO NOT MERGE] Copy appop modes on write to avoid locked IO" into qt-qpr1-dev 2019-09-06 19:21:56 +00:00
TreeHugger Robot
9c81f1754c Merge "Fix zen alarms only mode check" into qt-qpr1-dev 2019-09-06 19:21:32 +00:00
Brad Ebinger
36d3aa0e02 Merge "Re-deprecating Capabilities in ImsFeature" 
am: f4cd3de77a

Change-Id: I3dab955f70d6f4027f79cefc3b9d35c1cbfffaa6
 2019-09-06 12:11:35 -07:00
Brad Ebinger
f4cd3de77a Merge "Re-deprecating Capabilities in ImsFeature" 2019-09-06 18:55:17 +00:00
Erin Yan
693b47af0c [automerger skipped] Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev am: 7ca7382a6e 
am: 9af8bb479d -s ours
am skip reason: change_id Iabbca72bf65b5e93aafd53296d77a88ccaaf5dfd with SHA1 fe3efb667f is in history

Change-Id: Iec365ff95a6705fbb71e69d7f8cf2985fd669569
 2019-09-06 11:49:18 -07:00
Erin Yan
9af8bb479d Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev 
am: 7ca7382a6e

Change-Id: I6fe2e01cd5c11f29d3ad5427502295daf629ab46
 2019-09-06 11:35:50 -07:00
Lucas Dupin
0d1b51e5d5 Merge "Fix default wallpaper transition issue" into qt-qpr1-dev am: 8de3b785c4 
am: c29e70ef63

Change-Id: Icf68f39b520ad708d3b113841c47100789d03c70
 2019-09-06 11:32:34 -07:00
Blake Kragten
4a2420a2f7 Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev am: cf1268a5f5 
am: da96cb4086

Change-Id: Ibddaa8aab5157b8480adb05c0cb8306d414c26eb
 2019-09-06 11:28:34 -07:00
Miranda Kephart
70ff3fb971 Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545 
Test: manual; presubmit on source branch

Change-Id: Ibc2bb3a04ee5605660ff4f2cf762af499db237c8
 2019-09-06 18:27:58 +00:00
Varun Shah
ea424deee9 Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev am: eff156093c 
am: a5c53a01ae

Change-Id: I9e172385ca47ee1a37986f27694b904acb22769b
 2019-09-06 11:25:35 -07:00
Jonathan Scott
b5e96b176b [automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 68f73efcb9 am: 00386d79f5 -s ours 
am: d43aa31232 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 fb77e63aa5 is in history

Change-Id: I63f53d1aa6514ff3c9a9f3d0e573aa8a72c85a99
 2019-09-06 11:20:13 -07:00
Erin Yan
be20b487bd [automerger skipped] Remove PASSWORD_QUALITY_MANAGED from CarTrustAgentUnlockDialogHelper am: b1af47bec8 
am: 4278063467 -s ours
am skip reason: change_id I5e848ca3183f624158dc192159f57aaa9d27a89c with SHA1 7bed781be5 is in history

Change-Id: I5395e1d12964f677b31a56f07aea2ee3f12b145b
 2019-09-06 11:18:17 -07:00
Heemin Seog
ba355da4ce [automerger skipped] Merge "Handle USB eject and unmount via Car Settings" into qt-qpr1-dev am: 59db7b8d01 
am: c799b2dcb0 -s ours
am skip reason: change_id I90b18eb0e66abb1b22701fd390202468970d9ae6 with SHA1 91fab5cb44 is in history

Change-Id: I0276a3910223742012ecef136c609abc3fa0e8b5
 2019-09-06 11:14:41 -07:00
Erin Yan
bc4b741979 Reduce the delay of showing unlock dialog to 0 
Bug: 136049501
Test: Manually on IHU
Change-Id: I0016290a5181b9acba73503f938772b90f583f66
Merged-in: I0016290a5181b9acba73503f938772b90f583f66
(cherry picked from commit 13ae817be2)
 2019-09-06 18:12:57 +00:00
TreeHugger Robot
7ca7382a6e Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev 2019-09-06 18:11:10 +00:00
TreeHugger Robot
2257e8b62d Merge "int userHandle -> int userId" 2019-09-06 18:08:08 +00:00
Lucas Dupin
c29e70ef63 Merge "Fix default wallpaper transition issue" into qt-qpr1-dev 
am: 8de3b785c4

Change-Id: I730392200e589e97192e1612ce7517ba2d6c93e1
 2019-09-06 11:07:36 -07:00
Erin Yan
b7eca93a5f [automerger skipped] Merge "Create dialog to show detecting Batmobile device & unlocking" into qt-qpr1-dev am: cf885ef399 
am: 80d3b193eb -s ours
am skip reason: change_id I47b55e3032c814623aa5bf5c5c3ec1899c03e98e with SHA1 16258e3e98 is in history

Change-Id: I08a27ba1e8061002d7d823fa2b83a9946947a3e9
 2019-09-06 11:04:22 -07:00
Blake Kragten
da96cb4086 Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev 
am: cf1268a5f5

Change-Id: I294286840c969fba42ff2814423ae4dbd81a8577
 2019-09-06 11:03:30 -07:00
Colin Cross
fe163c6f7d Merge changes from topic "protobuf-3.9.1" 
* changes:
  Convert statsd_test and statsd_benchmark to proto lite
  Adapt to google::protobuf::uint64 type change
 2019-09-06 18:01:08 +00:00
Varun Shah
a5c53a01ae Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev 
am: eff156093c

Change-Id: Iece7adc8dd9a3cb5c704e917b22337cf8339f460
 2019-09-06 10:59:13 -07:00
Pinyao Ting
f747a43df2 [automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours am: 122636b4f5 -s ours am: a86312e067 -s ours 
am: 4351f32689 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history

Change-Id: I72bf10271ed38bbf518a647d783e3520bb9f235c
 2019-09-06 10:55:22 -07:00
Jonathan Scott
d43aa31232 [automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 68f73efcb9 
am: 00386d79f5 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 a5e4422d14 is in history

Change-Id: I3a0dbdfc2de586cbb7dbeb0d0d9fd34535323b42
 2019-09-06 10:53:38 -07:00
Erin Yan
4278063467 Remove PASSWORD_QUALITY_MANAGED from CarTrustAgentUnlockDialogHelper 
am: b1af47bec8

Change-Id: Ib569c5cf238e196deec26f65662e437b7db05510
 2019-09-06 10:50:34 -07:00
Heemin Seog
c799b2dcb0 Merge "Handle USB eject and unmount via Car Settings" into qt-qpr1-dev 
am: 59db7b8d01

Change-Id: Ia01b9fe95c175f242b771fa1cb1b33bceecda896
 2019-09-06 10:49:43 -07:00
Erin Yan
80d3b193eb Merge "Create dialog to show detecting Batmobile device & unlocking" into qt-qpr1-dev 
am: cf885ef399

Change-Id: Ib7d8a17d32690414b34e646df631c78c167593eb
 2019-09-06 10:48:27 -07:00