313449 Commits

Author SHA1 Message Date
Andrii Kulian
8623f89c32 Merge "Update display contents when metrics change" into oc-dev am: d6f0b0fc4f
am: de938b99fc

Change-Id: I5420f04c0d3f910ad1db3e0e5266e26de0c6f3f7
2017-04-04 02:00:22 +00:00
Jeff Sharkey
a999b02c70 Merge "Emit fingerprints during OTA upgrades." into oc-dev am: 19627d678b
am: 5ea809f29c

Change-Id: I4825d7480861ca6518f15bbfea0274c1527b2c3a
2017-04-04 01:59:27 +00:00
TreeHugger Robot
d6c72ce92b Merge "Stop restoring tasks added before recent is loaded" 2017-04-04 01:56:50 +00:00
Ajay Panicker
4101bfe0ef Merge "Make sure that the device name is not null before returning it" am: d4963e8035 am: 87d114ac3e am: c6438a68d6
am: 70b3e38772

Change-Id: I12902cef94e1311831a4c7ac5de76d75e411648b
2017-04-04 01:51:01 +00:00
Andrii Kulian
de938b99fc Merge "Update display contents when metrics change" into oc-dev
am: d6f0b0fc4f

Change-Id: I808ab4d68954773ba8c8691478d9fe47e1e2378f
2017-04-04 01:49:35 +00:00
Jeff Sharkey
5ea809f29c Merge "Emit fingerprints during OTA upgrades." into oc-dev
am: 19627d678b

Change-Id: I3a545f11f50716b23e3d110950afee179aecf7fa
2017-04-04 01:48:26 +00:00
Daniel Cardenas
a66371e9be Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev am: d017221a52
am: dbcf5279ad

Change-Id: Ia98eaa934f9be88cbec1410555e35c773f6e4ff8
2017-04-04 01:47:15 +00:00
Ajay Panicker
70b3e38772 Merge "Make sure that the device name is not null before returning it" am: d4963e8035 am: 87d114ac3e
am: c6438a68d6

Change-Id: I90c31e9f1c304d6696908d3518c3e96940fea8f6
2017-04-04 01:42:47 +00:00
Andrii Kulian
d6f0b0fc4f Merge "Update display contents when metrics change" into oc-dev 2017-04-04 01:38:25 +00:00
Daniel Cardenas
dbcf5279ad Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev
am: d017221a52

Change-Id: Icf9271e418052931ca15c3a7727f01cfedd044c9
2017-04-04 01:38:16 +00:00
Ajay Panicker
c6438a68d6 Merge "Make sure that the device name is not null before returning it" am: d4963e8035
am: 87d114ac3e

Change-Id: I874a58ecc54ddd46837c6e21b6244e5bb40312d7
2017-04-04 01:35:05 +00:00
TreeHugger Robot
19627d678b Merge "Emit fingerprints during OTA upgrades." into oc-dev 2017-04-04 01:33:28 +00:00
TreeHugger Robot
d017221a52 Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev 2017-04-04 01:28:43 +00:00
Ajay Panicker
87d114ac3e Merge "Make sure that the device name is not null before returning it"
am: d4963e8035

Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225
2017-04-04 01:27:41 +00:00
Dongwon Kang
10b9632eac Merge "TIF: use integer for constants instead of string" into oc-dev am: b43a5305bd
am: 2227541021

Change-Id: Ib3661309d1969e5b6407c739e4112d9c2a83e00d
2017-04-04 01:26:33 +00:00
Dongwon Kang
2227541021 Merge "TIF: use integer for constants instead of string" into oc-dev
am: b43a5305bd

Change-Id: I84143eee4102a8e40f74571b8c8903ff5a10cb56
2017-04-04 01:19:09 +00:00
Treehugger Robot
d4963e8035 Merge "Make sure that the device name is not null before returning it" 2017-04-04 01:11:08 +00:00
TreeHugger Robot
b43a5305bd Merge "TIF: use integer for constants instead of string" into oc-dev 2017-04-04 01:10:44 +00:00
Hugo Benichi
d95470fa53 Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev am: df9cf5450c
am: 83f89047f5

Change-Id: I36ec48b9b8095cd407e5b56771227714cfec66db
2017-04-04 01:05:54 +00:00
Hugo Benichi
83f89047f5 Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev
am: df9cf5450c

Change-Id: I7d7b66cc1dc6888ea28e2b4d83d570fa440c29f2
2017-04-04 00:58:02 +00:00
Felipe Leme
656fb1b4ca Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev am: 5efad86b91
am: ece77d4bdc

Change-Id: Ibee9f3f4068b282e0d0f977abd3fafa2123b17de
2017-04-04 00:52:55 +00:00
Winson Chung
51814c7ed6 Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev am: afb6b504b2
am: e2d8a79b2c

Change-Id: I938ffe52529830e5a109bc08298a4ffd3301982f
2017-04-04 00:51:56 +00:00
Jason Monk
58691f1212 Merge "Add some strings that will be needed for QS changes" into oc-dev am: f2764a4aed
am: 6c04503fce

Change-Id: If354ea18a2919a1f9776942e9f4be09421d62d71
2017-04-04 00:51:01 +00:00
Hugo Benichi
df9cf5450c Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev 2017-04-04 00:50:24 +00:00
Hangyu Kuang
60024fca06 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev am: 99442d3427
am: 958a284426

Change-Id: I0df6e5b0ba764b5b1f80e3e96b9ab7ecaf756a61
2017-04-04 00:50:07 +00:00
Felipe Leme
ece77d4bdc Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev
am: 5efad86b91

Change-Id: I090ee3668c21a49b570d323a0f765da10088c4c6
2017-04-04 00:45:29 +00:00
Winson Chung
e2d8a79b2c Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev
am: afb6b504b2

Change-Id: I0de879374d452f20a6b678aaf2f506034c21c749
2017-04-04 00:44:32 +00:00
Jason Monk
6c04503fce Merge "Add some strings that will be needed for QS changes" into oc-dev
am: f2764a4aed

Change-Id: Id89770140b8cac1ec746aff6a9c1fd4049449254
2017-04-04 00:43:33 +00:00
Hangyu Kuang
958a284426 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev
am: 99442d3427

Change-Id: I4fc864ea29049ea4585dd71ee8a921b35ae7e147
2017-04-04 00:42:31 +00:00
TreeHugger Robot
5efad86b91 Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev 2017-04-04 00:39:56 +00:00
TreeHugger Robot
afb6b504b2 Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev 2017-04-04 00:39:09 +00:00
TreeHugger Robot
f2764a4aed Merge "Add some strings that will be needed for QS changes" into oc-dev 2017-04-04 00:35:41 +00:00
Chad Brubaker
820ab35913 Merge "Expose animator settings to Instant Apps" into oc-dev am: d490fe0372
am: fb095d897f

Change-Id: I9e28019f15b57a636df0d9881fb03e61813374c6
2017-04-04 00:35:02 +00:00
TreeHugger Robot
99442d3427 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev 2017-04-04 00:33:46 +00:00
Chad Brubaker
fb095d897f Merge "Expose animator settings to Instant Apps" into oc-dev
am: d490fe0372

Change-Id: I3a88cc331949e987462aca315e7f396d5491147b
2017-04-04 00:31:01 +00:00
TreeHugger Robot
d490fe0372 Merge "Expose animator settings to Instant Apps" into oc-dev 2017-04-04 00:23:34 +00:00
Jesse Evans
df82235f1a Merge "Adds appropriate filtering for instant apps" into oc-dev am: de5be11955
am: daa4b22f45

Change-Id: I52960268fda5f9edfdfede094b6e1e85136bdae8
2017-04-04 00:15:32 +00:00
Keun-young Park
e7b147a6b3 Merge "support shutdown animation from bootanim" into oc-dev am: 67b898a3db
am: e400768440

Change-Id: Ia9448d9bc29583700e26625ed0f914e30ee9182e
2017-04-04 00:07:19 +00:00
Chad Brubaker
3a93a90966 Merge "Expose framework activities to Instant Apps" into oc-dev am: b157f08bf8
am: 59551672c1

Change-Id: I231f32fe6ec5958ed88490da42dbd69e57956bb5
2017-04-04 00:05:08 +00:00
Jesse Evans
daa4b22f45 Merge "Adds appropriate filtering for instant apps" into oc-dev
am: de5be11955

Change-Id: I7c4ea3c1bfcefa59cf0abedc3c5c1d8ec8effa08
2017-04-04 00:04:29 +00:00
Keun-young Park
e400768440 Merge "support shutdown animation from bootanim" into oc-dev
am: 67b898a3db

Change-Id: I10eb52e2c6b68001c3a52bb33e170cf4c10f956e
2017-04-03 23:59:29 +00:00
Chad Brubaker
59551672c1 Merge "Expose framework activities to Instant Apps" into oc-dev
am: b157f08bf8

Change-Id: I250524c3ad576b8af2643b08b519d24832c73415
2017-04-03 23:58:25 +00:00
Philip P. Moltmann
7530670d33 Merge "Not send switch intents if there is no real intent" into oc-dev am: 82331f7f73
am: 09b5ec8ee1

Change-Id: I790378322f543762ef7fda0253e48259e9bf5d3e
2017-04-03 23:57:27 +00:00
TreeHugger Robot
de5be11955 Merge "Adds appropriate filtering for instant apps" into oc-dev 2017-04-03 23:55:19 +00:00
TreeHugger Robot
67b898a3db Merge "support shutdown animation from bootanim" into oc-dev 2017-04-03 23:51:41 +00:00
TreeHugger Robot
b157f08bf8 Merge "Expose framework activities to Instant Apps" into oc-dev 2017-04-03 23:51:06 +00:00
Philip P. Moltmann
09b5ec8ee1 Merge "Not send switch intents if there is no real intent" into oc-dev
am: 82331f7f73

Change-Id: Ief39b33a90bbc6d9428006baccd6b293572d17f3
2017-04-03 23:51:02 +00:00
Makoto Onuki
6483c2d5fa Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev am: 5fd39fad26
am: d6da0d25cb

Change-Id: Iac4bdaf66a661218eca4a562646e4867998b5cab
2017-04-03 23:47:26 +00:00
Tony Mak
99652287d0 Merge "Whitelist DMAgent from bg check" into oc-dev am: fcfb396f5e
am: 7c700a3d78

Change-Id: I11e655f13342a8995e410deb8cd0c8c8e7fcd92c
2017-04-03 23:46:27 +00:00
TreeHugger Robot
82331f7f73 Merge "Not send switch intents if there is no real intent" into oc-dev 2017-04-03 23:44:45 +00:00