Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
412,955 Commits 3 Branches 0 Tags
0f0803ad073c8fd8ee13baddecdf605a80652b23
Commit Graph

412955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sasha Smundak
0f0803ad07 Merge "[automerger skipped] Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" am: c9cb0dc031 am: e9834d4fbf -s ours 
am: a0cae6d209 -s ours
am skip reason: change_id I8d270949cb2dd4391ceeaf57ea8557be849c9ed8 with SHA1 a244eb44a6 is in history

Change-Id: I56058b46b57a34329648d40e6478511808bbb0e3
 2019-04-05 04:31:19 -07:00
Remi NGUYEN VAN
f85635e8cf Merge "Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc74057 am: 2d7dbf8ea3" into qt-dev-plus-aosp 
am: 55f9b6eaca

Change-Id: I2b1dfae776ecd4f5d68c1a8c5a63b3fa12230729
 2019-04-05 04:23:40 -07:00
Sundong Ahn
a523e5e806 Merge "Merge "Change to choice" am: 5baeab86a0 am: a409e9fbb7" into qt-dev-plus-aosp 
am: f99d86e427

Change-Id: Ic3c4f82fc57d40d6bca0c36c6033d0b040dd8f1a
 2019-04-05 04:08:04 -07:00
Steven Moreland
ad2e77bdb2 [automerger skipped] Merge "Merge "ApplicationLoaders: hard failures & tests" am: 54ea352532 am: be708ba226" into qt-dev-plus-aosp 
am: 44e3a56f93 -s ours
am skip reason: change_id Ib259bcdf472e6a2f7f6b1071bb70cfead4502231 with SHA1 0975a412b3 is in history

Change-Id: Ie7744da458f779fca3588e52b1ff17efa5253791
 2019-04-05 03:54:04 -07:00
Zimuzo
ecec311d68 Merge "Merge "Refactor PackageWatchdog explicit health checks" into qt-dev am: e0283ded0a" into qt-dev-plus-aosp 
am: ed8907bf93

Change-Id: I4dcf25b6eae1c1e06fc288e4e49d7f199b3be8af
 2019-04-05 03:36:19 -07:00
Android Build Merger (Role)
a0cae6d209 Merge "[automerger skipped] Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" am: c9cb0dc031 am: e9834d4fbf -s ours am skip reason: change_id I8d270949cb2dd4391ceeaf57ea8557be849c9ed8 with SHA1 a244eb44a6 is in history" into qt-dev-plus-aosp 2019-04-05 10:27:19 +00:00
Sasha Smundak
8961436581 [automerger skipped] Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" am: c9cb0dc031 
am: e9834d4fbf -s ours
am skip reason: change_id I8d270949cb2dd4391ceeaf57ea8557be849c9ed8 with SHA1 a244eb44a6 is in history

Change-Id: I5e8c9b4fe35d794d1e050aa38645d55a5ce31643
 2019-04-05 03:26:51 -07:00
Tyler Gunn
02ea4114c2 resolve merge conflicts of 37f6620029 to stage-aosp-master am: 4d97d127fd 
am: 3fa5ea624f

Change-Id: If35a6a7bdc1191ae8eda65a0062666dc03febea2
 2019-04-05 03:24:53 -07:00
Android Build Merger (Role)
55f9b6eaca Merge "Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc74057 am: 2d7dbf8ea3" into qt-dev-plus-aosp 2019-04-05 10:22:45 +00:00
Remi NGUYEN VAN
647f26405f Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc74057 
am: 2d7dbf8ea3

Change-Id: I5e3d6aacbeaba7346e014875a457a0ac52977ead
 2019-04-05 03:22:16 -07:00
Sasha Smundak
854ba7b4c4 Merge "Convert core/tests/**/Android.mk file to Android.bp" am: d0fc8c9d5b am: 37c0949bf5 
am: 7d6c615c82

Change-Id: I2aa612489d6a35c1bf5ef1f5e3736260d8862d77
 2019-04-05 03:20:51 -07:00
Android Build Merger (Role)
f99d86e427 Merge "Merge "Change to choice" am: 5baeab86a0 am: a409e9fbb7" into qt-dev-plus-aosp 2019-04-05 10:18:16 +00:00
Sundong Ahn
af2f3a23ad Merge "Change to choice" am: 5baeab86a0 
am: a409e9fbb7

Change-Id: I8daa12509dcaef8af48ba85b4130872f9b1d5952
 2019-04-05 03:17:41 -07:00
Android Build Merger (Role)
44e3a56f93 Merge "Merge "ApplicationLoaders: hard failures & tests" am: 54ea352532 am: be708ba226" into qt-dev-plus-aosp 2019-04-05 10:13:58 +00:00
Steven Moreland
6ee6b380b1 Merge "ApplicationLoaders: hard failures & tests" am: 54ea352532 
am: be708ba226

Change-Id: I3f92f35cec1222760c584c77c007dd344047d99c
 2019-04-05 03:13:20 -07:00
Android Build Merger (Role)
ed8907bf93 Merge "Merge "Refactor PackageWatchdog explicit health checks" into qt-dev am: e0283ded0a" into qt-dev-plus-aosp 2019-04-05 10:10:04 +00:00
Zimuzo
76194357cb Merge "Refactor PackageWatchdog explicit health checks" into qt-dev 
am: e0283ded0a

Change-Id: Ie34c43aa81fec038e9cd8a17c720336fd09fb1e4
 2019-04-05 03:09:35 -07:00
Tyler Gunn
3fa5ea624f resolve merge conflicts of 37f6620029 to stage-aosp-master 
am: 4d97d127fd

Change-Id: I212ae695fe28d013e2cc960f2032d814eb9eb8e8
 2019-04-05 03:08:48 -07:00
Sasha Smundak
7d6c615c82 Merge "Convert core/tests/**/Android.mk file to Android.bp" am: d0fc8c9d5b 
am: 37c0949bf5

Change-Id: Ia4e91ee9eb77fbd5d9063ce28506fe60b86aec36
 2019-04-05 03:06:44 -07:00
TreeHugger Robot
e0283ded0a Merge "Refactor PackageWatchdog explicit health checks" into qt-dev 2019-04-05 09:45:40 +00:00
Narayan Kamath
c444eb82ce Merge "Fix rollbacks in multi-user case." 2019-04-05 09:39:09 +00:00
Sungsoo Lim
d8f6ae1a09 Merge "Fix system_server watchdog timeout" into qt-dev am: 4bb49a7b07 
am: 1de554dd19

Change-Id: I7ff653c1b702ccc7928bcd118ee52847320a30fd
 2019-04-05 02:30:27 -07:00
Sungsoo Lim
1de554dd19 Merge "Fix system_server watchdog timeout" into qt-dev 
am: 4bb49a7b07

Change-Id: I1bdf728e3cad37a66bab21116902a5b15359fb1c
 2019-04-05 02:20:13 -07:00
Sungsoo Lim
4bb49a7b07 Merge "Fix system_server watchdog timeout" into qt-dev 2019-04-05 09:09:21 +00:00
Yifan Hong
cf4b528026 [automerger skipped] Merge "Fix NetworkStackTests." into qt-dev am: 841dc62b5a -s ours 
am: ccd94533ba -s ours
am skip reason: change_id I0d60d7a317fa60607d6fdaea15f61b458aefd2f0 with SHA1 0e5459731f is in history

Change-Id: Ifc3dc7f22d9f6038983aa5de3ae5257037bf2473
 2019-04-05 01:25:57 -07:00
Yifan Hong
ccd94533ba [automerger skipped] Merge "Fix NetworkStackTests." into qt-dev 
am: 841dc62b5a -s ours
am skip reason: change_id I0d60d7a317fa60607d6fdaea15f61b458aefd2f0 with SHA1 0e5459731f is in history

Change-Id: Ia25198b3ed7d4704ffa3bd50a5399a81ff26cb7a
 2019-04-05 01:13:39 -07:00
TreeHugger Robot
841dc62b5a Merge "Fix NetworkStackTests." into qt-dev 2019-04-05 08:02:37 +00:00
Hyunyoung Song
6c6783d7d6 Merge "Set sdk_version for PluginCoreLib" into qt-dev am: 4787332da4 
am: e6b9caf01e

Change-Id: I616dbe7669f8200a2ba5e26ef338ab3f3364c418
 2019-04-05 00:12:02 -07:00
Hyunyoung Song
e6b9caf01e Merge "Set sdk_version for PluginCoreLib" into qt-dev 
am: 4787332da4

Change-Id: Ibd868cb4416f2470d3edf3203ff2a241269ca150
 2019-04-05 00:02:36 -07:00
Kevin Chyn
7983525413 Merge "Add secure setting to cache attention" into qt-dev am: 12852fdc7d 
am: 6e5ade0169

Change-Id: Ieb1050a3b34091c6f1734916a5a7b49396ebe427
 2019-04-05 00:01:53 -07:00
Kevin Chyn
6e5ade0169 Merge "Add secure setting to cache attention" into qt-dev 
am: 12852fdc7d

Change-Id: Ia591d7c0a8b50cb72f1c309f5121e7e542d13e6d
 2019-04-04 23:51:58 -07:00
TreeHugger Robot
4787332da4 Merge "Set sdk_version for PluginCoreLib" into qt-dev 2019-04-05 06:49:33 +00:00
Anil Admal
92e64a8a56 Merge "Restore gnss@1.1 HAL capability bits removed in gnss@2.0 (framework)" into qt-dev am: e79cbfd022 
am: 508e9aee08

Change-Id: I0c14904c5e9edaea7175ca8ccbc00b72310d4a90
 2019-04-04 23:36:39 -07:00
Kevin Chyn
12852fdc7d Merge "Add secure setting to cache attention" into qt-dev 2019-04-05 06:33:37 +00:00
Anil Admal
508e9aee08 Merge "Restore gnss@1.1 HAL capability bits removed in gnss@2.0 (framework)" into qt-dev 
am: e79cbfd022

Change-Id: Ie8e2075675d92cadc17452ebf350cfa22928c53f
 2019-04-04 23:27:31 -07:00
Anil Admal
e79cbfd022 Merge "Restore gnss@1.1 HAL capability bits removed in gnss@2.0 (framework)" into qt-dev 2019-04-05 06:15:35 +00:00
Matt Pietal
acb612fcaa Merge "Sharesheet - Fix portrait -> landscape switch" into qt-dev am: 9620e07e4f 
am: 07f3fa1e2e

Change-Id: I0fc9519930735788369d89d691636e76d9995fe5
 2019-04-04 23:01:44 -07:00
Matt Pietal
07f3fa1e2e Merge "Sharesheet - Fix portrait -> landscape switch" into qt-dev 
am: 9620e07e4f

Change-Id: I414f4310e255b59f21c829cdec236fa22309a1a2
 2019-04-04 22:51:44 -07:00
Lyn Han
23efdb0478 Merge "Remove unused flags from bubble controller" into qt-dev am: 68c570ecbc 
am: 22e579bf1f

Change-Id: I9f51f3fc1fa7097e78c5ee61ae0753125b1e41bd
 2019-04-04 22:37:00 -07:00
TreeHugger Robot
9620e07e4f Merge "Sharesheet - Fix portrait -> landscape switch" into qt-dev 2019-04-05 05:33:13 +00:00
Lyn Han
22e579bf1f Merge "Remove unused flags from bubble controller" into qt-dev 
am: 68c570ecbc

Change-Id: Ia754892440f60b386ec78bfe4ad6b7879e9b91a4
 2019-04-04 22:28:28 -07:00
Kevin Chyn
a004c6c69b [automerger skipped] Merge "Fix enumerate corner case" into qt-dev am: 442a4e7b16 
am: 538ced2cc6 -s ours
am skip reason: change_id I766cc04be151abaae60a0092f71fd7a3acf3397a with SHA1 ea80d17cb6 is in history

Change-Id: Ia4955bd730b8011f609aa9f05633fcc886e987d3
 2019-04-04 22:17:18 -07:00
Sasha Smundak
e9834d4fbf Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" 
am: c9cb0dc031

Change-Id: Iee2eae42ebb1e46c3ddda978d0b219d7b094b92c
 2019-04-04 22:16:06 -07:00
TreeHugger Robot
68c570ecbc Merge "Remove unused flags from bubble controller" into qt-dev 2019-04-05 05:10:58 +00:00
Kevin Chyn
1ac8b9d575 [automerger skipped] Merge "Update BiometricPrompt default title" into qt-dev am: c301e0393c 
am: 6d1f8d5dbe -s ours
am skip reason: change_id I3b82396694a26d63a79334e7e86c4e9121a370f6 with SHA1 87fbeab12f is in history

Change-Id: I284ec26a81f9ac5e24e5dd03a84e633a19a5a820
 2019-04-04 22:08:08 -07:00
Treehugger Robot
c9cb0dc031 Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp" 2019-04-05 04:59:14 +00:00
John Reck
4ef664a3e6 Merge "Add back render-ahead support" into qt-dev am: 22477c4dd0 
am: 3e1d6fdc4a

Change-Id: I528633caec1c90886174dce216bc36f70ad267a0
 2019-04-04 21:58:20 -07:00
Kevin Chyn
538ced2cc6 Merge "Fix enumerate corner case" into qt-dev 
am: 442a4e7b16

Change-Id: I439fdd7f2c4977f50a68d860a071542d192e3a36
 2019-04-04 21:53:38 -07:00
John Reck
402cc87779 Merge "Add draw props back to greylist" into qt-dev am: 410d783f5b 
am: e84938418c

Change-Id: I6032f7eb9e488b8711bc6424f9998f3e9dd46902
 2019-04-04 21:45:31 -07:00
Kevin Chyn
6d1f8d5dbe Merge "Update BiometricPrompt default title" into qt-dev 
am: c301e0393c

Change-Id: I5d422fa2a00f59ac8041fecba6c38bbd236d9aea
 2019-04-04 21:45:21 -07:00