Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
427,397 Commits 3 Branches 0 Tags
a02b046558f0d203a7dceabe8ed735677d20ac9c
Commit Graph

427397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kavi Gupta
a02b046558 Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" am: edf7470e0b am: 7762c4aa6c 
am: c1a4da00c6

Change-Id: I6b0623318a13f47139efd96e9361d060992edf0f
 2019-06-28 16:53:18 -07:00
Fabian Kozynski
5cb4433c53 Merge "Fixes for CBRS" into qt-r1-dev 
am: 65e4bc410d

Change-Id: I8d90c69aa52f76bbc5ffae5f9883f3ca81bd323c
 2019-06-28 16:48:14 -07:00
Beverly
174c31409c Merge "Return true if there were plugin sensors available" into qt-r1-dev 
am: deb772499f

Change-Id: Ie4eb0cbbd69ad3212f3c741c7c0248f97c6dd961
 2019-06-28 16:37:17 -07:00
Kavi Gupta
c1a4da00c6 Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" am: edf7470e0b 
am: 7762c4aa6c

Change-Id: I717b3393095ae16b919aa77ace6104526ea8b17a
 2019-06-28 16:16:52 -07:00
Kavi Gupta
7762c4aa6c Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" 
am: edf7470e0b

Change-Id: Ic0905474c956824a9526ce29949c8d667c91ba39
 2019-06-28 16:01:36 -07:00
Treehugger Robot
edf7470e0b Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" 2019-06-28 22:41:14 +00:00
Andrew Sapperstein
d9bd0a1ef8 Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev am: 9dd0c5628b 
am: e2232f9690

Change-Id: I7a21585e6fcfd871998348699f37fcc9e982a3dd
 2019-06-28 14:53:41 -07:00
Anthony Han
d691ea0c4f Merge "DWB Bias splines ignore default ambient CCT" into qt-r1-dev 
am: 3c19edaec6

Change-Id: I22c9d01ef0a65b0c8a5aa1ed2e3fda959c70f963
 2019-06-28 14:50:20 -07:00
Jorim Jaggi
c194ee53bd [automerger skipped] Merge "GestureNav: Limit exclusion rects" into qt-dev am: ea3216d462 
am: 5f6a315ed3 -s ours
am skip reason: change_id Ib26161663a6aababe803d3c70044f4017bdbe675 with SHA1 506267d5f4 is in history

Change-Id: I56f798bad5ac8161e26bc04f04dbb3ad723be034
 2019-06-28 14:49:20 -07:00
Mathew Inwood
3c94697078 Merge "Restore some greylist entries." into qt-dev am: f76bdce6e0 
am: 68d07b7d6b

Change-Id: I2ddc8cf9efae1ceab6ebdcef4a366b6734c14188
 2019-06-28 14:48:24 -07:00
Matt Pietal
3ff6d0ea7c Merge "Resolver - Improve flow for Intent URL handling" into qt-dev am: d73543b588 
am: adde9fdbe9

Change-Id: I464d99eb23ec7cedfaddf291c05159e0bc468b36
 2019-06-28 14:47:31 -07:00
Sanry Huang
2c0ccf2987 Merge "Use the real activity component to find reusable task" into qt-dev am: f0cea00104 
am: 5160de70ab

Change-Id: I299ee34493d468e75e96447789b7f54ebd6134ae
 2019-06-28 14:46:42 -07:00
Bonian Chen
235532f839 Merge "[VoLTE short code] Enable ATT configuration on FirstNet" into qt-r1-dev 
am: b0bc99f5cd

Change-Id: Ic90b31e5ffd044790e2374e92da496d190409e48
 2019-06-28 14:45:53 -07:00
Dave Mankoff
32eeff7fcb Merge "Ensure that notifications don't wake the screen even when far away." into qt-r1-dev 
am: 5818d2f606

Change-Id: I32e7c954a274bbfd60c0ca96c4aca375ea3a983d
 2019-06-28 14:44:58 -07:00
Tej Singh
8ecabb4be3 Merge "StatsdStats: improve activation time logging" into qt-dev am: 26b6ef7904 
am: 1b5e46fdf5

Change-Id: I1e794a820b7216dcd0c3fe0187396c4d8291e476
 2019-06-28 14:44:11 -07:00
David Nelloms
ef691a34c1 [automerger skipped] Merge "Notify on task display change." into qt-dev am: 22a5e4e5d9 -s ours 
am: 3b077cbfe0 -s ours
am skip reason: change_id Idabad8379cded664bcf302d5c6fb69564d158eb7 with SHA1 a06b4b2fa5 is in history

Change-Id: I0755c459f75a0a96641dc2bdb3882368cd194318
 2019-06-28 14:43:21 -07:00
Jaewan Kim
10e0de0d26 Merge "Fallback to default volume handling when session is released" into qt-dev am: d1008f8339 
am: 1691f87f2b

Change-Id: I9351361751e769cedc6a40b042a21c6c78a750d0
 2019-06-28 14:42:10 -07:00
Hai Zhang
cb279a7544 Merge "Add link to AndroidX Role library in RoleManager documentation." into qt-dev am: bde371beb6 
am: 140e4c4e23

Change-Id: Ib8ddc0e3ab16573a71d931017d7d2e4a90452663
 2019-06-28 14:41:25 -07:00
Lucas Dupin
7ebf2b132c Merge "Enable "lift to retry" on face-auth devices" into qt-r1-dev 
am: e4d39d199d

Change-Id: I8096a4f149e8cdd954b3108389c69ad0e5bf36ab
 2019-06-28 14:40:40 -07:00
Robert Snoeberger
5364c456f2 Merge "Disable custom clock faces in SystemUI" into qt-dev am: 6613ea8da3 
am: 8fa9dd8173

Change-Id: Ia5b8ca81deed73fd4e34bb9e87c5a41ca0f2edc5
 2019-06-28 14:40:00 -07:00
Bill Yi
8fa925d05a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 33cc350063 -s ours
am skip reason: subject contains skip directive

Change-Id: I2d64c387c481c37033496ef86fa9aa17fe78b53e
 2019-06-28 14:39:18 -07:00
Bill Yi
4341a6089b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 949a22d754 -s ours 
am: aae5486926 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie86250ef0189ab701bf8f801c90310d2df915aaa
 2019-06-28 14:38:38 -07:00
Hyunyoung Song
f788b51ed2 Merge "Transfer focus to open panel" into qt-r1-dev 
am: 67232a88c2

Change-Id: Ie9d3cc01f863fca98197b59dcbac532eb0177025
 2019-06-28 14:37:34 -07:00
Tim Joines
60f9ee7265 Merge "Disable USAP by default on devices" into qt-dev am: 6c3bbf9e93 
am: 4ecc6562f6

Change-Id: I9e32d1ed9c0f18b884818c37dd4eacf771030b6e
 2019-06-28 14:36:40 -07:00
Peiyong Lin
7537aeeb9f Merge "Attach color space information when attach and queue buffer." into qt-r1-dev 
am: 964fcdbebd

Change-Id: I37376be3cdf0a8c72111c6de257eda4274f406c2
 2019-06-28 14:35:34 -07:00
Jorim Jaggi
ccaa47c919 Request invalidate root when legacy nav bar bg changes am: 6482df5602 
am: e1619cb541

Change-Id: I4135675c2e422ab08645937f3e6f05a87f2dcfe5
 2019-06-28 14:34:33 -07:00
Lucas Dupin
34420e52b6 Merge "Avoid stuck wake-locks" into qt-dev am: 13775aa4bb 
am: 53aa96d708

Change-Id: Ie6f774ff880020d5fff37f9115f707133f7e4a65
 2019-06-28 14:33:51 -07:00
Ahan Wu
037b60e170 Merge "Move image wallpaper rendering works to background thread." into qt-dev am: 84ed5df87f 
am: bd2b9725e0

Change-Id: Ib9429b962df7ca3d92b7c72869bacf86fceea2d5
 2019-06-28 14:32:55 -07:00
Edgar Wang
aa9010894b Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev 
am: 98a51d1080

Change-Id: Ia5aebe8d37a7c375137dc0c4895da62a6ed305cc
 2019-06-28 14:30:25 -07:00
Arthur Hung
d2eb98130b Merge "Fix WindowFocusTests#testTapNonFocusableWindow failed" into qt-dev am: de5b1d3805 
am: d2c76e148e

Change-Id: I52173c6152e55b8ef80f554eb87389c45c92b90f
 2019-06-28 14:29:35 -07:00
Lucas Dupin
0d88e51183 Merge "LockIcon fixes" into qt-r1-dev 
am: 8eccd076fa

Change-Id: I6b304f86053f1646a1f8c6e5df5cdb3e47084d23
 2019-06-28 14:28:54 -07:00
Makoto Onuki
5a9dee3694 Merge "Remove STOPSHOP, disable DEBUG_ANR" into qt-dev am: 73e6028ea0 
am: 6e9eedb963

Change-Id: I7f415aff42b727504f0f2b716005fb8285142197
 2019-06-28 14:28:16 -07:00
Robert Snoeberger
80804faa24 Merge "Disable ClockOptionsProvider so clocks don't appear in picker app" into qt-dev am: 386f09235d 
am: ccf9a609b3

Change-Id: If2172db10d7f7bf21aab21b3b921b212121c8c1c
 2019-06-28 14:27:34 -07:00
Eugene Susla
1036b3342f Merge "Don't throw from PooledLambda#toString" into qt-dev am: 667d2c91bc 
am: 9bff1b578f

Change-Id: Ide56d406acde32f10a0c181b629a7b7efe3d102a
 2019-06-28 14:26:49 -07:00
Philip P. Moltmann
49a0a28fe8 Merge "Set most leniant mode if two perms affect one appop" into qt-dev am: d84102bf9e 
am: 1554254bed

Change-Id: I90dbaa4a06ec88fdfe7355d4bed53d03a5d25127
 2019-06-28 14:21:46 -07:00
Hongwei Wang
1f87a4ef70 Merge "Comparing dimension and rotation instead of DisplayInfo" into qt-dev am: 50ab7b076d 
am: e041e62324

Change-Id: I31a2a124ba95c47ac056aa07be14f2bc64ecad1d
 2019-06-28 14:18:51 -07:00
Christopher Tate
7ab6041377 [automerger skipped] Merge "Defer PSS collection while an activity is starting" into qt-dev am: 94f0c20ee9 
am: 8335a75238 -s ours
am skip reason: change_id Icf5cf2e3dde0bd5fd3ab9c4a85adfb1f3382057f with SHA1 fa778eb014 is in history

Change-Id: I8c59f833099826e00ad75c22524259ea6d108f6d
 2019-06-28 14:18:06 -07:00
Amith Yamasani
a636bee7d4 Merge "Fix a regression in setting oom_adj for cached processes" into qt-dev am: 4025715b3e 
am: 40d13af878

Change-Id: I6962c166df8ebd7f701fcaace85796dba8a245f7
 2019-06-28 14:17:22 -07:00
Govinda Wasserman
365ebdb0e6 Merge "[DO NOT MERGE] resolve merge conflicts of 079d81a479 to qt-r1-dev" into qt-r1-dev 
am: c982441edb

Change-Id: Ib4f75dc6c42b3ab7057ffbd0504850d77d3448d4
 2019-06-28 14:16:29 -07:00
Govinda Wasserman
9050e52abe [automerger skipped] [DO NOT MERGE] resolve merge conflicts of 079d81a479 to qt-r1-dev 
am: 8803dd60e4 -s ours
am skip reason: SHA1 8803dd60e4 skipped by user ccross

Change-Id: I21c990cd6b098d7d656aee6a4739fed71e10edff
 2019-06-28 14:16:26 -07:00
Mathew Inwood
7a4d871174 Merge "Restore some greylist entries." into qt-dev am: f4535c8d51 
am: cd82f9adff

Change-Id: Iff29bca8243e0c5e0e7ec30cd8b4a3f95c43ac82
 2019-06-28 13:30:26 -07:00
Mathew Inwood
cd82f9adff Merge "Restore some greylist entries." into qt-dev 
am: f4535c8d51

Change-Id: I3851fed60bedab9748f2d6d53f342f2605ecf78b
 2019-06-28 13:18:30 -07:00
TreeHugger Robot
f4535c8d51 Merge "Restore some greylist entries." into qt-dev 2019-06-28 20:01:13 +00:00
Fabian Kozynski
65e4bc410d Merge "Fixes for CBRS" into qt-r1-dev 2019-06-28 18:21:37 +00:00
TreeHugger Robot
deb772499f Merge "Return true if there were plugin sensors available" into qt-r1-dev 2019-06-28 17:53:38 +00:00
Andrew Sapperstein
d31df7f72e Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev am: 9dd0c5628b 
am: f08f33b97b

Change-Id: Ie1a17e8e23af0d058b7117e0197ca69bfb589343
 2019-06-28 10:47:54 -07:00
Andrew Sapperstein
e2232f9690 Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev 
am: 9dd0c5628b

Change-Id: Ibf712294cea1eeab1651d6f43b97e145b07d54c4
 2019-06-28 10:32:14 -07:00
Andrew Sapperstein
f08f33b97b Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev 
am: 9dd0c5628b

Change-Id: Ia58094614151af83aadd36bb04e0389050dd05be
 2019-06-28 10:28:00 -07:00
Mathieu Chartier
0c2a0a352e Merge "Remove support for image classes" am: 566bfcf475 am: e8131249e5 
am: fd36670bd0

Change-Id: Ibe45154d4945ea47023c7d750e5d3c86db7f6c51
 2019-06-28 10:12:36 -07:00
TreeHugger Robot
3c19edaec6 Merge "DWB Bias splines ignore default ambient CCT" into qt-r1-dev 2019-06-28 17:02:54 +00:00